|
 |
84b277 |
From 597dd2168bb3e7f62842b07c9df1bb7c7c47b793 Mon Sep 17 00:00:00 2001
|
|
|
84b277 |
From: Lennart Poettering <lennart@poettering.net>
|
|
|
84b277 |
Date: Tue, 25 Mar 2014 00:31:48 +0100
|
|
|
84b277 |
Subject: [PATCH] systemctl: --kill-mode is long long gone, don't mention it in
|
|
|
84b277 |
the man page
|
|
|
84b277 |
|
|
|
84b277 |
(cherry-picked from 0088d63151e088d62104d88f866e9eb049091c22)
|
|
|
84b277 |
|
|
|
84b277 |
Resolves: #1147524
|
|
|
84b277 |
---
|
|
|
84b277 |
man/systemctl.xml | 5 ++---
|
|
|
84b277 |
shell-completion/bash/systemctl | 5 +----
|
|
|
84b277 |
2 files changed, 3 insertions(+), 7 deletions(-)
|
|
|
84b277 |
|
|
|
84b277 |
diff --git a/man/systemctl.xml b/man/systemctl.xml
|
|
|
84b277 |
index cb63bb0..f68b606 100644
|
|
|
84b277 |
--- a/man/systemctl.xml
|
|
|
84b277 |
+++ b/man/systemctl.xml
|
|
|
84b277 |
@@ -672,9 +672,8 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
|
|
|
84b277 |
<listitem>
|
|
|
84b277 |
<para>Send a signal to one or more processes of the
|
|
|
84b277 |
unit. Use <option>--kill-who=</option> to select which
|
|
|
84b277 |
- process to kill. Use <option>--kill-mode=</option> to select
|
|
|
84b277 |
- the kill mode and <option>--signal=</option> to select the
|
|
|
84b277 |
- signal to send.</para>
|
|
|
84b277 |
+ process to kill. Use <option>--signal=</option> to select
|
|
|
84b277 |
+ the signal to send.</para>
|
|
|
84b277 |
</listitem>
|
|
|
84b277 |
</varlistentry>
|
|
|
84b277 |
<varlistentry>
|
|
|
84b277 |
diff --git a/shell-completion/bash/systemctl b/shell-completion/bash/systemctl
|
|
|
84b277 |
index efe8485..cbf0eb7 100644
|
|
|
84b277 |
--- a/shell-completion/bash/systemctl
|
|
|
84b277 |
+++ b/shell-completion/bash/systemctl
|
|
|
84b277 |
@@ -74,7 +74,7 @@ _systemctl () {
|
|
|
84b277 |
[STANDALONE]='--all -a --reverse --after --before --defaults --fail --ignore-dependencies --failed --force -f --full -l --global
|
|
|
84b277 |
--help -h --no-ask-password --no-block --no-legend --no-pager --no-reload --no-wall
|
|
|
84b277 |
--quiet -q --privileged -P --system --user --version --runtime'
|
|
|
84b277 |
- [ARG]='--host -H --kill-mode --kill-who --property -p --signal -s --type -t --state --root'
|
|
|
84b277 |
+ [ARG]='--host -H --kill-who --property -p --signal -s --type -t --state --root'
|
|
|
84b277 |
)
|
|
|
84b277 |
|
|
|
84b277 |
local -A PROPS='CPUAccounting= MemoryAccounting= BlockIOAccounting= MemoryLimit= CPUShares= BlockIOWeight= DevicePolicy= DeviceAllow= BlockIOReadBandwidth= BlockIOWriteBandwidth= BlockIODeviceWeight='
|
|
|
84b277 |
@@ -101,9 +101,6 @@ _systemctl () {
|
|
|
84b277 |
--kill-who)
|
|
|
84b277 |
comps='all control main'
|
|
|
84b277 |
;;
|
|
|
84b277 |
- --kill-mode)
|
|
|
84b277 |
- comps='control-group process'
|
|
|
84b277 |
- ;;
|
|
|
84b277 |
--root)
|
|
|
84b277 |
comps=$(compgen -A directory -- "$cur" )
|
|
|
84b277 |
compopt -o filenames
|