diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-02-01 18:23:46 -0500 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2017-02-02 00:23:46 +0100 |
| commit | bef19548a2430909019d7cff095b8600c796c3ef (patch) | |
| tree | 331adc3f8243d585b2bd2f076cbe485f6f135afc | |
| parent | 1cec251c24f7736518315f3680eac3d1cad975ab (diff) | |
systemctl: restore --failed (#5198)
'systemctl --failed' is an extremely common operation and it's nice to have
a shortcut for it.
Revert "man: don't document systemctl --failed" and add the option back to
systemctl's help and shell completion scripts.
This reverts commit 036359ba8d0aba7db7eac75d10073a849a033fd1.
| -rw-r--r-- | man/systemctl.xml | 12 | ||||
| -rw-r--r-- | shell-completion/bash/systemctl.in | 2 | ||||
| -rw-r--r-- | shell-completion/zsh/_systemctl.in | 1 | ||||
| -rw-r--r-- | src/systemctl/systemctl.c | 1 |
4 files changed, 11 insertions, 5 deletions
diff --git a/man/systemctl.xml b/man/systemctl.xml index 87cf52172b..25db00e5f6 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -393,10 +393,14 @@ <xi:include href="user-system-options.xml" xpointer="user" /> <xi:include href="user-system-options.xml" xpointer="system" /> - <!-- we do not document -failed here, as it has been made - redundant by -state=failed, which it predates. To keep - things simple, we only document the new switch, while - keeping the old one around for compatibility only. --> + <varlistentry> + <term><option>--failed</option></term> + + <listitem> + <para>List units in failed state. This is equivalent to + <option>--state=failed</option>.</para> + </listitem> + </varlistentry> <varlistentry> <term><option>--no-wall</option></term> diff --git a/shell-completion/bash/systemctl.in b/shell-completion/bash/systemctl.in index 7765010869..e4ccad8799 100644 --- a/shell-completion/bash/systemctl.in +++ b/shell-completion/bash/systemctl.in @@ -126,7 +126,7 @@ _systemctl () { [STANDALONE]='--all -a --reverse --after --before --defaults --force -f --full -l --global --help -h --no-ask-password --no-block --no-legend --no-pager --no-reload --no-wall --now --quiet -q --privileged -P --system --user --version --runtime --recursive -r --firmware-setup - --show-types -i --ignore-inhibitors --plain' + --show-types -i --ignore-inhibitors --plain --failed' [ARG]='--host -H --kill-who --property -p --signal -s --type -t --state --job-mode --root --preset-mode -n --lines -o --output -M --machine' ) diff --git a/shell-completion/zsh/_systemctl.in b/shell-completion/zsh/_systemctl.in index 553216da5e..92a56ba99a 100644 --- a/shell-completion/zsh/_systemctl.in +++ b/shell-completion/zsh/_systemctl.in @@ -386,4 +386,5 @@ _arguments -s \ {-o+,--output=}'[Change journal output mode]:modes:_sd_outputmodes' \ '--firmware-setup[Tell the firmware to show the setup menu on next boot]' \ '--plain[When used with list-dependencies, print output as a list]' \ + '--failed[Show failed units]' \ '*::systemctl command:_systemctl_command' diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index a20ca1bcb5..8f80559baf 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -6937,6 +6937,7 @@ static void systemctl_help(void) { " -a --all Show all properties/all units currently in memory,\n" " including dead/empty ones. To list all units installed on\n" " the system, use the 'list-unit-files' command instead.\n" + " --failed Same as --state=failed\n" " -l --full Don't ellipsize unit names on output\n" " -r --recursive Show unit list of host and local containers\n" " --reverse Show reverse dependencies with 'list-dependencies'\n" |