diff options
author | Lennart Poettering <lennart@poettering.net> | 2012-08-09 15:57:24 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2012-08-09 15:57:24 +0200 |
commit | 51abe64c859c01ffad4f80840396ad9f6d5c9e62 (patch) | |
tree | 8f1da4c2021514ea3c2b6bd60efbe04fabddff52 /man/journald.conf.xml | |
parent | 4e818ef351aa6c8239b125713a91f5fc682a5e26 (diff) |
journald: basic support for /dev/kmsg parsing
Diffstat (limited to 'man/journald.conf.xml')
-rw-r--r-- | man/journald.conf.xml | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/man/journald.conf.xml b/man/journald.conf.xml index d7caea83cc..2ebbf30a68 100644 --- a/man/journald.conf.xml +++ b/man/journald.conf.xml @@ -210,17 +210,12 @@ is running the respective option has no effect. By default only forwarding to syslog is enabled. These settings - may be overridden at boot time with the - kernel command line options + may be overridden at boot time with + the kernel command line options <literal>systemd.journald.forward_to_syslog=</literal>, <literal>systemd.journald.forward_to_kmsg=</literal> and - <literal>systemd.journald.forward_to_console=</literal>. If - forwarding to the kernel log buffer and - <varname>ImportKernel=</varname> is - enabled at the same time care is taken - to avoid logging loops. It is safe to - use these options in combination. + <literal>systemd.journald.forward_to_console=</literal>. </para></listitem> </varlistentry> @@ -271,23 +266,6 @@ </varlistentry> <varlistentry> - <term><varname>ImportKernel=</varname></term> - - <listitem><para>Controls whether - kernel log messages shall be stored in - the journal. Takes a boolean argument - and defaults to disabled. Note that - currently only one userspace service - can read kernel messages at a time, - which means that kernel log message - reading might get corrupted if it - is enabled in more than one service, - for example in both the journal and a - traditional syslog service. - </para></listitem> - </varlistentry> - - <varlistentry> <term><varname>Storage=</varname></term> <listitem><para>Controls where to |