diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-10-14 20:20:07 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-10-14 21:18:42 -0400 |
| commit | f29c77bc0179b0fa57407dbe30b495be9f5ad2e8 (patch) | |
| tree | eade4b1dc7e61dce57dd6fed52539299992c5f4a /shell-completion/bash | |
| parent | 1f8af042d99cf40543dad0ec049cf7aa2911feba (diff) | |
shell-completion: fix completion of inactive units
Units which not loaded were not proposed properly. OTOH, we should
filter units from get-unit-files by their state if they are currently
loaded. Bring zsh completions in line with bash completion, the same
logic should be used in both implementations.
https://bugzilla.redhat.com/show_bug.cgi?id=1024379
https://bugzilla.redhat.com/show_bug.cgi?id=790768
https://bugs.freedesktop.org/show_bug.cgi?id=84720
Diffstat (limited to 'shell-completion/bash')
| -rw-r--r-- | shell-completion/bash/systemctl.in | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/shell-completion/bash/systemctl.in b/shell-completion/bash/systemctl.in index 015001815f..bca02310a9 100644 --- a/shell-completion/bash/systemctl.in +++ b/shell-completion/bash/systemctl.in @@ -55,10 +55,14 @@ __get_all_units () { { __systemctl $1 list-unit-files; __systemctl $1 list- | { while read -r a b; do echo " $a"; done; }; } __get_active_units () { __systemctl $1 list-units \ | { while read -r a b; do echo " $a"; done; }; } -__get_startable_units () { { - __systemctl $1 list-units --all -t service,timer,socket,mount,automount,path,snapshot,swap - __systemctl $1 list-unit-files -t service,timer,socket,mount,automount,path,snapshot,swap; } \ - | { while read -r a b c d; do [[ $c == "inactive" || $c == "failed" ]] && echo " $a"; done; }; } +__get_startable_units () { + # find inactive or failed units, filter out masked and not-found + __systemctl $1 list-units --state inactive,failed -- $( __get_all_units ) | \ + { while read -r a b c d; do [[ $b == "loaded" ]] && echo " $a"; done; }; } +__get_restartable_units () { + # find !masked, filter out masked and not-found + __systemctl $1 list-units --state active,inactive,failed -- $( __get_all_units ) | \ + { while read -r a b c d; do [[ $b == "loaded" ]] && echo " $a"; done; }; } __get_failed_units () { __systemctl $1 list-units \ | { while read -r a b c d; do [[ $c == "failed" ]] && echo " $a"; done; }; } __get_enabled_units () { __systemctl $1 list-unit-files \ @@ -180,10 +184,7 @@ _systemctl () { elif __contains_word "$verb" ${VERBS[RESTARTABLE_UNITS]}; then comps=$( __filter_units_by_property $mode CanStart yes \ - $( __get_all_units $mode \ - | while read -r line; do \ - [[ "$line" =~ @\.|\.(device|snapshot|socket|timer)$ ]] || echo " $line"; \ - done )) + $( __get_restartable_units $mode)) compopt -o filenames elif __contains_word "$verb" ${VERBS[STOPPABLE_UNITS]}; then |