diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-06-28 15:39:56 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-06-28 16:14:04 -0400 |
| commit | 8453f06257f984a8dbeba92dfe02b52204c9abf8 (patch) | |
| tree | 30517483f62fbb5bf8115a73c8d371a5f37c4da7 /src | |
| parent | f3bd7561c54dea82b128d06f6b269a4951ae2855 (diff) | |
journalct: do no allow --this-boot to take arguments
Before --this-boot was deprecated in a331b5e6d47243, it did not take
any arguments.
Diffstat (limited to 'src')
| -rw-r--r-- | src/journal/journalctl.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index ac55e68b90..043c6d9630 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -348,6 +348,7 @@ static int parse_argv(int argc, char *argv[]) { ARG_NO_FULL, ARG_NO_TAIL, ARG_NEW_ID128, + ARG_THIS_BOOT, ARG_LIST_BOOTS, ARG_USER, ARG_SYSTEM, @@ -392,9 +393,9 @@ static int parse_argv(int argc, char *argv[]) { { "new-id128", no_argument, NULL, ARG_NEW_ID128 }, { "quiet", no_argument, NULL, 'q' }, { "merge", no_argument, NULL, 'm' }, + { "this-boot", no_argument, NULL, ARG_THIS_BOOT }, /* deprecated */ { "boot", optional_argument, NULL, 'b' }, { "list-boots", no_argument, NULL, ARG_LIST_BOOTS }, - { "this-boot", optional_argument, NULL, 'b' }, /* deprecated */ { "dmesg", no_argument, NULL, 'k' }, { "system", no_argument, NULL, ARG_SYSTEM }, { "user", no_argument, NULL, ARG_USER }, @@ -544,6 +545,10 @@ static int parse_argv(int argc, char *argv[]) { arg_merge = true; break; + case ARG_THIS_BOOT: + arg_boot = true; + break; + case 'b': arg_boot = true; |