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 a4f9e2d7ee288633ed648de28074a697ce1d7603..91461a77323a42c204ef58a01c8be41502bc9efc 100644 (file)
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -705,18 +705,6 @@
         </para></listitem>
       </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>
 

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index a9e4af1dd8838ad1a65aab8959dc5fb1f645593c..12d2559509376c74d63758d1ad0d9456eeb2718d 100644 (file)
--- 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 */