From: Lennart Poettering Date: Tue, 2 Oct 2018 14:42:30 +0000 (+0200) Subject: journalctl: drop --new-id128 from help and man texts X-Git-Tag: v240~646^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=19a073db9bd45ccb9d1daaca0c1aa550fcb4fc31;p=thirdparty%2Fsystemd.git journalctl: drop --new-id128 from help and man texts Let's remove redundancy and not advertise "journalctl --new-id128" anymore, now that we have "systemd-id128 new" in a proper tool. This allows us to reduce the overly large journalctl command set a bit. Note that this just removes the --help and man text, the call remains available for compat reasons. --- diff --git a/man/journalctl.xml b/man/journalctl.xml index a4f9e2d7ee2..91461a77323 100644 --- a/man/journalctl.xml +++ b/man/journalctl.xml @@ -705,18 +705,6 @@ - - - - Instead of showing journal contents, generate - a new 128-bit ID suitable for identifying messages. This is - intended for usage by developers who need a new identifier for - a new message they introduce and want to make - recognizable. This will print the new ID in four different - formats which can be copied into source code or similar. - - - diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index a9e4af1dd88..12d25595093 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -362,7 +362,6 @@ static int help(void) { " --list-catalog Show all message IDs in the catalog\n" " --dump-catalog Show entries in the message catalog\n" " --update-catalog Update the message catalog database\n" - " --new-id128 Generate a new 128-bit ID\n" " --setup-keys Generate a new FSS key pair\n" "\nSee the %s for details.\n" , program_invocation_short_name @@ -424,7 +423,7 @@ static int parse_argv(int argc, char *argv[]) { { "no-full", no_argument, NULL, ARG_NO_FULL }, { "lines", optional_argument, NULL, 'n' }, { "no-tail", no_argument, NULL, ARG_NO_TAIL }, - { "new-id128", no_argument, NULL, ARG_NEW_ID128 }, + { "new-id128", no_argument, NULL, ARG_NEW_ID128 }, /* deprecated */ { "quiet", no_argument, NULL, 'q' }, { "merge", no_argument, NULL, 'm' }, { "this-boot", no_argument, NULL, ARG_THIS_BOOT }, /* deprecated */