shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-27 13:57:26 +03:00
Code

systemctl: make -f short for both --follow and --force

Browse Source
This commit is contained in:
Lennart Poettering 2012-04-03 14:43:48 +02:00
parent 08f23fd29c
commit 568b679f2a
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TODO
View File

@ -30,8 +30,6 @@ Features:
* dbus upstream still refers to dbus.target and shouldn't
* Make -f in systemctl enable both --follow and --force
* ensure that logind sets the syslog facility to AUTH when logging
* when a service has the same env var set twice we actually store it twice and return that in systemctl show -p... We should only show the last setting

1
man/systemctl.xml
View File

@ -430,6 +430,7 @@
<varlistentry>
<term><option>--follow</option></term>
<term><option>-f</option></term>
<listitem><para>When used with
<command>status</command> continously

21
src/systemctl.c
View File

@ -4247,7 +4247,8 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
ARG_NO_ASK_PASSWORD,
ARG_FAILED,
ARG_RUNTIME,
ARG_FOLLOW
ARG_FOLLOW,
ARG_FORCE
};
static const struct option options[] = {
@ -4271,7 +4272,7 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
{ "order", no_argument, NULL, ARG_ORDER },
{ "require", no_argument, NULL, ARG_REQUIRE },
{ "root", required_argument, NULL, ARG_ROOT },
{ "force", no_argument, NULL, 'f' },
{ "force", no_argument, NULL, ARG_FORCE },
{ "no-reload", no_argument, NULL, ARG_NO_RELOAD },
{ "kill-mode", required_argument, NULL, ARG_KILL_MODE }, /* undocumented on purpose */
{ "kill-who", required_argument, NULL, ARG_KILL_WHO },
@ -4392,10 +4393,20 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
arg_quiet = true;
break;
case 'f':
case ARG_FORCE:
arg_force ++;
break;
case ARG_FOLLOW:
arg_follow = true;
break;
case 'f':
/* -f is short for both --follow and --force! */
arg_force ++;
arg_follow = true;
break;
case ARG_NO_RELOAD:
arg_no_reload = true;
break;
@ -4439,10 +4450,6 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
}
break;
case ARG_FOLLOW:
arg_follow = true;
break;
case 'o':
arg_output = output_mode_from_string(optarg);
if (arg_output < 0) {