From f4bab1690ebb7bb01ea2d89f92bffd26c04b61ee Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 19 Jun 2014 13:46:01 +0200 Subject: [PATCH] coredump: coredumpctl is so useful now, make it a first-class citizen Drop the "systemd-" prefix, renaming it from "systemd-coredumpctl" to "coredumpctl". --- .gitignore | 2 +- Makefile-man.am | 4 ++-- Makefile.am | 10 +++++----- ...systemd-coredumpctl.xml => coredumpctl.xml} | 12 ++++++------ man/systemd.journal-fields.xml | 4 ++-- .../bash/{systemd-coredumpctl => coredumpctl} | 8 ++++---- .../zsh/{_systemd-coredumpctl => _coredumpctl} | 18 +++++++++--------- 7 files changed, 29 insertions(+), 29 deletions(-) rename man/{systemd-coredumpctl.xml => coredumpctl.xml} (95%) rename shell-completion/bash/{systemd-coredumpctl => coredumpctl} (90%) rename shell-completion/zsh/{_systemd-coredumpctl => _coredumpctl} (54%) diff --git a/.gitignore b/.gitignore index 97cefb514ad..66fa09dc527 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 03adc7ca267..938e2c3fd99 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 bd3313815a3..d7fa9da9a8d 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 similarity index 95% rename from man/systemd-coredumpctl.xml rename to man/coredumpctl.xml index 092ec56a24f..159fabb8408 100644 --- a/man/systemd-coredumpctl.xml +++ b/man/coredumpctl.xml @@ -21,11 +21,11 @@ along with systemd; If not, see . --> - - systemd-coredumpctl + coredumpctl systemd @@ -39,18 +39,18 @@ - systemd-coredumpctl + coredumpctl 1 - systemd-coredumpctl + coredumpctl Retrieve coredumps from the journal - systemd-coredumpctl + coredumpctl OPTIONS COMMAND PID|COMM|EXE|MATCH @@ -60,7 +60,7 @@ Description - systemd-coredumpctl may be used to + coredumpctl may be used to retrieve coredumps from systemd-journald8. diff --git a/man/systemd.journal-fields.xml b/man/systemd.journal-fields.xml index 6eeb6e395d5..472a0855cd7 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 - systemd-coredumpctl1. + coredumpctl1. @@ -597,7 +597,7 @@ journalctl1, journald.conf5, sd-journal3, - systemd-coredumpctl1, + coredumpctl1, systemd.directives7 diff --git a/shell-completion/bash/systemd-coredumpctl b/shell-completion/bash/coredumpctl similarity index 90% rename from shell-completion/bash/systemd-coredumpctl rename to shell-completion/bash/coredumpctl index 805e84824e3..e23152d6a85 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 similarity index 54% rename from shell-completion/zsh/_systemd-coredumpctl rename to shell-completion/zsh/_coredumpctl index 94b1e92f59e..d13bc703a80 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' -- 2.39.2