diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-10-19 00:12:46 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-10-19 00:12:46 +0200 |
| commit | aae9a96d4b3a8562af9e8c6a23871b442645b954 (patch) | |
| tree | 891ceb62ef8465e972433f72f568baeaf20638ce | |
| parent | ed757c0cb03eef50e8d9aeb4682401c3e9486f0b (diff) | |
systemctl: remove --follow option
Given that "journalctl -u" exists now there's no need to duplicate this
functionality in systemctl, so let's drop this, especially given that it
always felt a bit awkward to overload "-f" to both --force and --follow,
and to have continues output with a status header for this.
systemctl status -f avahi-daemon
now becomes:
journalctl -fu avahi-daemon
Which is shorter and a lot less redundant.
| -rw-r--r-- | man/systemctl.xml | 11 | ||||
| -rw-r--r-- | src/systemctl/systemctl.c | 11 |
2 files changed, 0 insertions, 22 deletions
diff --git a/man/systemctl.xml b/man/systemctl.xml index fedc588766..c452dfc43f 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -443,17 +443,6 @@ </varlistentry> <varlistentry> - <term><option>--follow</option></term> - <term><option>-f</option></term> - - <listitem><para>When used with - <command>status</command> continuously - prints new journal entries as they are - appended to the - journal.</para></listitem> - </varlistentry> - - <varlistentry> <term><option>--output=</option></term> <term><option>-o</option></term> diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index d77d534e0b..545d7e1395 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -123,7 +123,6 @@ static enum transport { TRANSPORT_POLKIT } arg_transport = TRANSPORT_NORMAL; static const char *arg_host = NULL; -static bool arg_follow = false; static unsigned arg_lines = 10; static OutputMode arg_output = OUTPUT_SHORT; @@ -2277,7 +2276,6 @@ static void print_status_info(UnitStatusInfo *i) { arg_all * OUTPUT_SHOW_ALL | (!on_tty() || pager_have()) * OUTPUT_FULL_WIDTH | on_tty() * OUTPUT_COLOR | - arg_follow * OUTPUT_FOLLOW | !arg_quiet * OUTPUT_WARN_CUTOFF; printf("\n"); @@ -3928,7 +3926,6 @@ static int systemctl_help(void) { " --root=PATH Enable unit files in the specified root directory\n" " --runtime Enable unit files only temporarily until next reboot\n" " -n --lines=INTEGER Journal entries to show\n" - " --follow Follow journal\n" " -o --output=STRING Change journal output mode (short, short-monotonic,\n" " verbose, export, json, json-pretty, json-sse, cat)\n\n" "Unit Commands:\n" @@ -4084,7 +4081,6 @@ static int systemctl_parse_argv(int argc, char *argv[]) { ARG_NO_ASK_PASSWORD, ARG_FAILED, ARG_RUNTIME, - ARG_FOLLOW, ARG_FORCE }; @@ -4118,7 +4114,6 @@ static int systemctl_parse_argv(int argc, char *argv[]) { { "privileged",no_argument, NULL, 'P' }, { "runtime", no_argument, NULL, ARG_RUNTIME }, { "lines", required_argument, NULL, 'n' }, - { "follow", no_argument, NULL, ARG_FOLLOW }, { "output", required_argument, NULL, 'o' }, { NULL, 0, NULL, 0 } }; @@ -4238,14 +4233,8 @@ static int systemctl_parse_argv(int argc, char *argv[]) { 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: |