summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-07-07 04:19:03 +0200
committerLennart Poettering <lennart@poettering.net>2011-07-07 04:19:03 +0200
commit69fc152fc133172433d2bacb6a1fb8b97b866e9d (patch)
tree1c2a3fddce6319b05c80ec1cd1a23a5cc68f57e3
parentef3a24de028efe885db1303b4843aba5ffd0f531 (diff)
systemctl: hide all information on --kill-mode= since it is mostly useless
-rw-r--r--man/systemctl.xml19
-rw-r--r--src/cgls.c4
-rw-r--r--src/systemctl.c7
3 files changed, 5 insertions, 25 deletions
diff --git a/man/systemctl.xml b/man/systemctl.xml
index a3e0a307a8..7eccecacc4 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -298,25 +298,6 @@
</varlistentry>
<varlistentry>
- <term><option>--kill-mode=</option></term>
-
- <listitem><para>When used with
- <command>kill</command>, choose the
- mode how to kill the selected
- processes. Must be one of
- <option>control-group</option> or
- <option>process</option> to select
- whether to kill the entire control
- group or only the selected process
- itself. If omitted defaults to
- <option>control-group</option> if
- <option>--kill-who=all</option> is
- set, or <option>process</option>
- otherwise. You probably never need to
- use this switch.</para></listitem>
- </varlistentry>
-
- <varlistentry>
<term><option>--kill-who=</option></term>
<listitem><para>When used with
diff --git a/src/cgls.c b/src/cgls.c
index aebf826c90..20d6531123 100644
--- a/src/cgls.c
+++ b/src/cgls.c
@@ -38,8 +38,8 @@ static void help(void) {
printf("%s [OPTIONS...] [CGROUP...]\n\n"
"Recursively show control group contents.\n\n"
- " -h --help Show this help\n"
- " --no-pager Do not pipe output into a pager.\n",
+ " -h --help Show this help\n"
+ " --no-pager Do not pipe output into a pager\n",
program_invocation_short_name);
}
diff --git a/src/systemctl.c b/src/systemctl.c
index 3b12441c80..c01a82c930 100644
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -80,8 +80,8 @@ static bool arg_failed = false;
static char **arg_wall = NULL;
static const char *arg_kill_who = NULL;
static const char *arg_kill_mode = NULL;
-static const char *arg_root = NULL;
static int arg_signal = SIGTERM;
+static const char *arg_root = NULL;
static usec_t arg_when = 0;
static enum action {
ACTION_INVALID,
@@ -4352,7 +4352,6 @@ static int systemctl_help(void) {
" pending\n"
" --ignore-dependencies\n"
" When queueing a new job, ignore all its dependencies\n"
- " --kill-mode=MODE How to send signal\n"
" --kill-who=WHO Who to send signal to\n"
" -s --signal=SIGNAL Which signal to send\n"
" -H --host=[user@]host\n"
@@ -4363,7 +4362,7 @@ static int systemctl_help(void) {
" --no-wall Don't send wall message before halt/power-off/reboot\n"
" --no-reload When enabling/disabling unit files, don't reload daemon\n"
" configuration\n"
- " --no-pager Do not pipe output into a pager.\n"
+ " --no-pager Do not pipe output into a pager\n"
" --no-ask-password\n"
" Do not ask for system passwords\n"
" --order When generating graph for dot, show only order\n"
@@ -4536,7 +4535,7 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
{ "force", no_argument, NULL, 'f' },
{ "no-reload", no_argument, NULL, ARG_NO_RELOAD },
{ "defaults", no_argument, NULL, ARG_DEFAULTS },
- { "kill-mode", required_argument, NULL, ARG_KILL_MODE },
+ { "kill-mode", required_argument, NULL, ARG_KILL_MODE }, /* undocumented on purpose */
{ "kill-who", required_argument, NULL, ARG_KILL_WHO },
{ "signal", required_argument, NULL, 's' },
{ "no-ask-password", no_argument, NULL, ARG_NO_ASK_PASSWORD },