picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10255 from poettering/hide-new-id128 

drop references to "journalctl --new-id128"
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-10-02 17:54:36 +02:00 committed by GitHub
parent 29088d374e b9d016d684
commit e80ef269a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 13 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
man/journalctl.xml
View File

@ -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>

4
man/sd-id128.xml
View File

@ -141,8 +141,8 @@ int main(int argc, char **argv) {
}</programlisting>
<para>Note that new, randomized IDs may be generated with
<citerefentry><refentrytitle>journalctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>'s
<option>--new-id128</option> option.</para>
<citerefentry><refentrytitle>systemd-id128</refentrytitle><manvolnum>1</manvolnum></citerefentry>'s
<command>new</command> command.</para>
</refsect1>
<xi:include href="libsystemd-pkgconfig.xml" />

6
man/sd_id128_randomize.xml
View File

@ -52,9 +52,9 @@
type, see
<citerefentry><refentrytitle>sd-id128</refentrytitle><manvolnum>3</manvolnum></citerefentry>.</para>
<para><citerefentry><refentrytitle>journalctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>'s
<option>--new-id128</option> option may be used as a command line
front-end for <function>sd_id128_randomize()</function>.</para>
<para><citerefentry><refentrytitle>systemd-id128</refentrytitle><manvolnum>1</manvolnum></citerefentry>'s
<command>new</command> command may be used as a command line front-end for
<function>sd_id128_randomize()</function>.</para>
</refsect1>
<refsect1>

12
man/systemd.journal-fields.xml
View File

@ -56,14 +56,10 @@
<varlistentry>
<term><varname>MESSAGE_ID=</varname></term>
<listitem>
<para>A 128-bit message identifier ID for recognizing
certain message types, if this is desirable. This should
contain a 128-bit ID formatted as a lower-case hexadecimal
string, without any separating dashes or suchlike. This is
recommended to be a UUID-compatible ID, but this is not
enforced, and formatted differently. Developers can generate
a new ID for this purpose with <command>journalctl
<option>--new-id128</option></command>.
<para>A 128-bit message identifier ID for recognizing certain message types, if this is desirable. This
should contain a 128-bit ID formatted as a lower-case hexadecimal string, without any separating dashes or
suchlike. This is recommended to be a UUID-compatible ID, but this is not enforced, and formatted
differently. Developers can generate a new ID for this purpose with <command>systemd-id128 new</command>.
</para>
</listitem>
</varlistentry>

3
src/journal/journalctl.c
View File

@ -363,7 +363,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
@ -425,7 +424,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 */

8
src/systemd/sd-messages.h
View File

@ -23,12 +23,10 @@
_SD_BEGIN_DECLARATIONS;
/* Hey! If you add a new message here, you *must* also update the
* message catalog with an appropriate explanation */
/* Hey! If you add a new message here, you *must* also update the message catalog with an appropriate explanation */
/* And if you add a new ID here, make sure to generate a random one
* with journalctl --new-id128. Do not use any other IDs, and do not
* count them up manually. */
/* And if you add a new ID here, make sure to generate a random one with "systemd-id128 new". Do not use any other IDs,
* and do not count them up manually. */
#define SD_MESSAGE_JOURNAL_START SD_ID128_MAKE(f7,73,79,a8,49,0b,40,8b,be,5f,69,40,50,5a,77,7b)
#define SD_MESSAGE_JOURNAL_START_STR SD_ID128_MAKE_STR(f7,73,79,a8,49,0b,40,8b,be,5f,69,40,50,5a,77,7b)