diff options
| author | Emil Velikov <emil.velikov@collabora.com> | 2018-06-11 16:35:23 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2018-06-11 17:15:12 +0100 |
| commit | 9b536b1af2730de61c21dbe0522fd40547b0468b (patch) | |
| tree | f6e4ad2fb638116e3abfc357325ed2930fefca9d /shell-completion | |
| parent | 98476dc8b23d3ac7cb7e818a066f519c888ef8ac (diff) | |
shell-completion: systemctl: do not list template units in {re,}start
Template units lacking DefaultInstance cannot be enabled/disabled or
started/restarted.
By adding DefaultInstance the unit can be enabled/disabled but it
still cannot be started/restarted.
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Diffstat (limited to 'shell-completion')
| -rw-r--r-- | shell-completion/bash/systemctl.in | 6 | ||||
| -rw-r--r-- | shell-completion/zsh/_systemctl.in | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/shell-completion/bash/systemctl.in b/shell-completion/bash/systemctl.in index 4ff76d87fc..1c26ca24c4 100644 --- a/shell-completion/bash/systemctl.in +++ b/shell-completion/bash/systemctl.in @@ -235,13 +235,11 @@ _systemctl () { compopt -o filenames elif __contains_word "$verb" ${VERBS[STARTABLE_UNITS]}; then - comps=$( __get_startable_units $mode "$cur"; - __get_template_names $mode "$cur") + comps=$( __get_startable_units $mode "$cur" ) compopt -o filenames elif __contains_word "$verb" ${VERBS[RESTARTABLE_UNITS]}; then - comps=$( __get_restartable_units $mode "$cur"; - __get_template_names $mode "$cur") + comps=$( __get_restartable_units $mode "$cur" ) compopt -o filenames elif __contains_word "$verb" ${VERBS[STOPPABLE_UNITS]}; then diff --git a/shell-completion/zsh/_systemctl.in b/shell-completion/zsh/_systemctl.in index e49129b902..173e815a19 100644 --- a/shell-completion/zsh/_systemctl.in +++ b/shell-completion/zsh/_systemctl.in @@ -206,7 +206,7 @@ done { local _sys_startable_units; _systemctl_startable_units _wanted systemd-units expl 'startable unit' \ - compadd "$@" - ${_sys_startable_units[*]} $(_systemctl_get_template_names) + compadd "$@" - ${_sys_startable_units[*]} } # Completion functions for STOPPABLE_UNITS @@ -246,7 +246,7 @@ for fun in restart reload-or-restart ; do { local _sys_restartable_units; _systemctl_restartable_units _wanted systemd-units expl 'restartable unit' \ - compadd "$@" - ${_sys_restartable_units[*]} $(_systemctl_get_template_names) + compadd "$@" - ${_sys_restartable_units[*]} } done |