summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--man/journalctl.xml12
-rw-r--r--src/journal/journalctl.c3
2 files changed, 1 insertions, 14 deletions
diff --git a/man/journalctl.xml b/man/journalctl.xml
index a4f9e2d7ee..91461a7732 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -706,18 +706,6 @@
</varlistentry>
<varlistentry>
- <term><option>--new-id128</option></term>
-
- <listitem><para>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.
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
<term><option>--header</option></term>
<listitem><para>Instead of showing journal contents, show
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index a9e4af1dd8..12d2559509 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 */