SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shell-completion: fix completion of inactive units

Browse Source 
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
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2014-10-14 21:18:42 -04:00
parent 1f8af042d9
commit f29c77bc01
2 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shell-completion/bash/systemctl.in
+9 -8
View File
@@ -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