shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-25 23:21:33 +03:00
Code

systemctl: hide all information on --kill-mode= since it is mostly useless

Browse Source
This commit is contained in:
Lennart Poettering 2011-07-07 04:19:03 +02:00
parent ef3a24de02
commit 69fc152fc1
3 changed files with 5 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
man/systemctl.xml
View File

@ -297,25 +297,6 @@
service might fail.</para></listitem>
</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>

4
src/cgls.c
View File

@ -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);
}

7
src/systemctl.c
View File

@ -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 },