diff options
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | Makefile-man.am | 4 | ||||
-rw-r--r-- | Makefile.am | 10 | ||||
-rw-r--r-- | man/coredumpctl.xml (renamed from man/systemd-coredumpctl.xml) | 12 | ||||
-rw-r--r-- | man/systemd.journal-fields.xml | 4 | ||||
-rw-r--r-- | shell-completion/bash/coredumpctl (renamed from shell-completion/bash/systemd-coredumpctl) | 8 | ||||
-rw-r--r-- | shell-completion/zsh/_coredumpctl (renamed from shell-completion/zsh/_systemd-coredumpctl) | 18 |
7 files changed, 29 insertions, 29 deletions
diff --git a/.gitignore b/.gitignore index 97cefb514a..66fa09dc52 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ /busctl /cdrom_id /collect +/coredumpctl /coverage/ /defined /exported @@ -56,7 +57,6 @@ /systemd-cgroups-agent /systemd-cgtop /systemd-coredump -/systemd-coredumpctl /systemd-cryptsetup /systemd-cryptsetup-generator /systemd-dbus1-generator diff --git a/Makefile-man.am b/Makefile-man.am index 03adc7ca26..938e2c3fd9 100644 --- a/Makefile-man.am +++ b/Makefile-man.am @@ -658,7 +658,7 @@ endif if ENABLE_COREDUMP MANPAGES += \ - man/systemd-coredumpctl.1 + man/coredumpctl.1 MANPAGES_ALIAS += \ # @@ -1477,6 +1477,7 @@ EXTRA_DIST += \ man/bootctl.xml \ man/bootup.xml \ man/busctl.xml \ + man/coredumpctl.xml \ man/crypttab.xml \ man/daemon.xml \ man/halt.xml \ @@ -1569,7 +1570,6 @@ EXTRA_DIST += \ man/systemd-cat.xml \ man/systemd-cgls.xml \ man/systemd-cgtop.xml \ - man/systemd-coredumpctl.xml \ man/systemd-cryptsetup-generator.xml \ man/systemd-cryptsetup@.service.xml \ man/systemd-delta.xml \ diff --git a/Makefile.am b/Makefile.am index bd3313815a..d7fa9da9a8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3706,22 +3706,22 @@ systemd_coredump_LDADD += \ libsystemd-acl.la endif -systemd_coredumpctl_SOURCES = \ +coredumpctl_SOURCES = \ src/journal/coredumpctl.c -systemd_coredumpctl_LDADD = \ +coredumpctl_LDADD = \ libsystemd-journal-internal.la \ libsystemd-internal.la \ libsystemd-shared.la bin_PROGRAMS += \ - systemd-coredumpctl + coredumpctl dist_bashcompletion_DATA += \ - shell-completion/bash/systemd-coredumpctl + shell-completion/bash/coredumpctl dist_zshcompletion_DATA += \ - shell-completion/zsh/_systemd-coredumpctl + shell-completion/zsh/_coredumpctl sysctl_DATA = \ sysctl.d/50-coredump.conf diff --git a/man/systemd-coredumpctl.xml b/man/coredumpctl.xml index 092ec56a24..159fabb840 100644 --- a/man/systemd-coredumpctl.xml +++ b/man/coredumpctl.xml @@ -21,11 +21,11 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. --> -<refentry id="systemd-coredumpctl" conditional='ENABLE_COREDUMP' +<refentry id="coredumpctl" conditional='ENABLE_COREDUMP' xmlns:xi="http://www.w3.org/2001/XInclude"> <refentryinfo> - <title>systemd-coredumpctl</title> + <title>coredumpctl</title> <productname>systemd</productname> <authorgroup> @@ -39,18 +39,18 @@ </refentryinfo> <refmeta> - <refentrytitle>systemd-coredumpctl</refentrytitle> + <refentrytitle>coredumpctl</refentrytitle> <manvolnum>1</manvolnum> </refmeta> <refnamediv> - <refname>systemd-coredumpctl</refname> + <refname>coredumpctl</refname> <refpurpose>Retrieve coredumps from the journal</refpurpose> </refnamediv> <refsynopsisdiv> <cmdsynopsis> - <command>systemd-coredumpctl</command> + <command>coredumpctl</command> <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="req">COMMAND</arg> <arg choice="opt" rep="repeat">PID|COMM|EXE|MATCH</arg> @@ -60,7 +60,7 @@ <refsect1> <title>Description</title> - <para><command>systemd-coredumpctl</command> may be used to + <para><command>coredumpctl</command> may be used to retrieve coredumps from <citerefentry><refentrytitle>systemd-journald</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para> </refsect1> diff --git a/man/systemd.journal-fields.xml b/man/systemd.journal-fields.xml index 6eeb6e395d..472a0855cd 100644 --- a/man/systemd.journal-fields.xml +++ b/man/systemd.journal-fields.xml @@ -459,7 +459,7 @@ messages containing coredumps from system and session units. See - <citerefentry><refentrytitle>systemd-coredumpctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>. + <citerefentry><refentrytitle>coredumpctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>. </para> </listitem> </varlistentry> @@ -597,7 +597,7 @@ <citerefentry><refentrytitle>journalctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>journald.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>sd-journal</refentrytitle><manvolnum>3</manvolnum></citerefentry>, - <citerefentry><refentrytitle>systemd-coredumpctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>, + <citerefentry><refentrytitle>coredumpctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd.directives</refentrytitle><manvolnum>7</manvolnum></citerefentry> </para> </refsect1> diff --git a/shell-completion/bash/systemd-coredumpctl b/shell-completion/bash/coredumpctl index 805e84824e..e23152d6a8 100644 --- a/shell-completion/bash/systemd-coredumpctl +++ b/shell-completion/bash/coredumpctl @@ -1,4 +1,4 @@ -# systemd-coredumpctl(1) completion -*- shell-script -*- +# coredumpctl(1) completion -*- shell-script -*- # # This file is part of systemd. # @@ -57,11 +57,11 @@ _coredumpctl() { COMPREPLY=( $(compgen -W '${__journal_fields[*]}' -S= -- "$cur") ) return 0 elif [[ $cur = *=* ]]; then - mapfile -t field_vals < <(systemd-coredumpctl -F "${prev%=}" 2>/dev/null) + mapfile -t field_vals < <(coredumpctl -F "${prev%=}" 2>/dev/null) COMPREPLY=( $(compgen -W '${field_vals[*]}' -- "${cur#=}") ) return 0 elif [[ $prev = '=' ]]; then - mapfile -t field_vals < <(systemd-coredumpctl -F "${COMP_WORDS[COMP_CWORD-2]}" 2>/dev/null) + mapfile -t field_vals < <(coredumpctl -F "${COMP_WORDS[COMP_CWORD-2]}" 2>/dev/null) comps=${field_vals[*]} else for ((i=0; i <= COMP_CWORD; i++)); do @@ -82,4 +82,4 @@ _coredumpctl() { return 0 } -complete -F _coredumpctl systemd-coredumpctl +complete -F _coredumpctl coredumpctl diff --git a/shell-completion/zsh/_systemd-coredumpctl b/shell-completion/zsh/_coredumpctl index 94b1e92f59..d13bc703a8 100644 --- a/shell-completion/zsh/_systemd-coredumpctl +++ b/shell-completion/zsh/_coredumpctl @@ -1,21 +1,21 @@ -#compdef systemd-coredumpctl +#compdef coredumpctl -_systemd-coredumpctl_command(){ - local -a _systemd_coredumpctl_cmds - _systemd_coredumpctl_cmds=( +_coredumpctl_command(){ + local -a _coredumpctl_cmds + _coredumpctl_cmds=( 'list:List available coredumps' 'dump:Print coredump to stdout' 'gdb:Start gdb on a coredump' ) if (( CURRENT == 1 )); then - _describe -t commands 'systemd-coredumpctl command' _systemd_coredumpctl_cmds + _describe -t commands 'coredumpctl command' _coredumpctl_cmds else local curcontext="$curcontext" local -a _dumps - cmd="${${_systemd_coredumpctl_cmds[(r)$words[1]:*]%%:*}}" + cmd="${${_coredumpctl_cmds[(r)$words[1]:*]%%:*}}" if (( $#cmd )); then - # user can set zstyle ':completion:*:*:systemd-coredumpctl:*' sort no for coredumps to be ordered by date, otherwise they get ordered by pid - _dumps=( "${(foa)$(systemd-coredumpctl list | awk 'BEGIN{OFS=":"} /^\s/ {sub(/[[ \t]+/, ""); print $5,$0}' 2>/dev/null)}" ) + # user can set zstyle ':completion:*:*:coredumpctl:*' sort no for coredumps to be ordered by date, otherwise they get ordered by pid + _dumps=( "${(foa)$(coredumpctl list | awk 'BEGIN{OFS=":"} /^\s/ {sub(/[[ \t]+/, ""); print $5,$0}' 2>/dev/null)}" ) if [[ -n "$_dumps" ]]; then _describe -t pids 'coredumps' _dumps else @@ -33,4 +33,4 @@ _arguments \ '--no-pager[Do not pipe output into a pager]' \ {-h,--help}'[Show this help]' \ '--version[Show package version]' \ - '*::systemd-coredumpctl commands:_systemd-coredumpctl_command' + '*::coredumpctl commands:_coredumpctl_command' |