summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-08-22 02:49:17 +0200
committerLennart Poettering <lennart@poettering.net>2012-08-22 02:49:17 +0200
commitbdfb9e7f7c315af5a6755ac4701b696ce2305a19 (patch)
treee2fa5e93af19e7a09e5311f0aecfe6ff1e59296f /man
parentc0d6e764d107a81a6439c41edbe92790623ed7de (diff)
journald: augment journal entries from the kernel with data from udev
Diffstat (limited to 'man')
-rw-r--r--man/sd_journal_print.xml20
-rw-r--r--man/systemd.journal-fields.xml30
2 files changed, 40 insertions, 10 deletions
diff --git a/man/sd_journal_print.xml b/man/sd_journal_print.xml
index 7eac6c8192..c03762ac2c 100644
--- a/man/sd_journal_print.xml
+++ b/man/sd_journal_print.xml
@@ -131,17 +131,19 @@
immediately followed by their associated parameters,
terminated by NULL. The strings passed should be of
the format <literal>VARIABLE=value</literal>. The
- variable name must be in uppercase and consist only
- of characters, numbers and underscores, and may not
- begin with an underscore. The value can be of any size
- and format. It is highly recommended to submit
- text strings formatted in the UTF-8 character encoding
- only, and submit binary fields only when formatting in
- UTf-8 strings is not sensible. A number of well known
- fields are defined, see
+ variable name must be in uppercase and consist only of
+ characters, numbers and underscores, and may not begin
+ with an underscore. (All assignments that do not
+ follow this syntax will be ignored.) The value can be
+ of any size and format. It is highly recommended to
+ submit text strings formatted in the UTF-8 character
+ encoding only, and submit binary fields only when
+ formatting in UTf-8 strings is not sensible. A number
+ of well known fields are defined, see
<citerefentry><refentrytitle>systemd.journal-fields</refentrytitle><manvolnum>7</manvolnum></citerefentry>
for details, but additional application defined fields
- may be used.</para>
+ may be used. A variable may be assigned more than one
+ value per entry.</para>
<para><function>sd_journal_sendv()</function> is
similar to <function>sd_journal_send()</function> but
diff --git a/man/systemd.journal-fields.xml b/man/systemd.journal-fields.xml
index d790c35a03..b555c0e0ac 100644
--- a/man/systemd.journal-fields.xml
+++ b/man/systemd.journal-fields.xml
@@ -58,7 +58,8 @@
sense. New fields may freely be defined by
applications, but a few fields have special
meaning. All fields with special meanings are
- optional.</para>
+ optional. In some cases fields may appear more than
+ once per entry.</para>
</refsect1>
<refsect1>
@@ -338,6 +339,33 @@
<para>The kernel subsystem name.</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term>_UDEV_SYSNAME=</term>
+ <listitem>
+ <para>The kernel device name
+ as it shows up in the device
+ tree below
+ <filename>/sys</filename>.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>_UDEV_DEVNODE=</term>
+ <listitem>
+ <para>The device node path of
+ this device in
+ <filename>/dev</filename>.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>_UDEV_DEVLINK=</term>
+ <listitem>
+ <para>Additional symlink names
+ pointing to the device node in
+ <filename>/dev</filename>. This
+ field is frequently set more
+ than once per entry.</para>
+ </listitem>
+ </varlistentry>
</variablelist>
</refsect1>