journald: add Storage= setting to control where the journal is stored

[elogind.git] / man / journald.conf.xml

diff --git a/man/journald.conf.xml b/man/journald.conf.xml
index 5d07509f7c591aeaa4aac169592914c6a7c78930..72d81fbdf454d668173087bb96eed00a4a37c561 100644 (file)
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -128,7 +128,7 @@
                                 prefixed with
                                 <literal>System</literal> apply to the
                                 journal files when stored on a
                                 prefixed with
                                 <literal>System</literal> apply to the
                                 journal files when stored on a

-                                persistant file system, more
+                                persistent file system, more

                                 specifically
                                 <filename>/var/log/journal</filename>. The
                                 options prefixed with
                                 specifically
                                 <filename>/var/log/journal</filename>. The
                                 options prefixed with


@@ -144,9 +144,9 @@
                                 exists. Otherwise only the latter
                                 applies. Note that this means that
                                 during early boot and if the
                                 exists. Otherwise only the latter
                                 applies. Note that this means that
                                 during early boot and if the

-                                administrator disabled persistant
+                                administrator disabled persistent

                                 logging only the latter options apply,
                                 logging only the latter options apply,

-                                while the former apply if persistant
+                                while the former apply if persistent

                                 logging is enabled and the system is
                                 fully booted
                                 up. <varname>SystemMaxUse=</varname>
                                 logging is enabled and the system is
                                 fully booted
                                 up. <varname>SystemMaxUse=</varname>


@@ -212,10 +212,10 @@
                                 to syslog is enabled. These settings
                                 may be overridden at boot time with the
                                 kernel command line options
                                 to syslog is enabled. These settings
                                 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>
+                                <literal>systemd.journald.forward_to_syslog=</literal>,
+                                <literal>systemd.journald.forward_to_kmsg=</literal>

                                 and
                                 and

-                                <literal>systemd_journald.forward_to_console=</literal>. If
+                                <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
                                 forwarding to the kernel log buffer and
                                 <varname>ImportKernel=</varname> is
                                 enabled at the same time care is taken


@@ -286,6 +286,46 @@
                                 traditional syslog service.
                                 </para></listitem>
                         </varlistentry>
                                 traditional syslog service.
                                 </para></listitem>
                         </varlistentry>

+
+                        <varlistentry>
+                                <term><varname>Storage=</varname></term>
+
+                                <listitem><para>Controls where to
+                                store journal data. One of
+                                <literal>volatile</literal>,
+                                <literal>permanent</literal>,
+                                <literal>auto</literal> and
+                                <literal>none</literal>. If
+                                <literal>volatile</literal> journal
+                                log data will be stored only in
+                                memory, i.e. below the
+                                <filename>/run/log/journal</filename>
+                                hierarchy (which is created if
+                                needed). If
+                                <literal>permanent</literal> data will
+                                be stored preferably on disk,
+                                i.e. below the
+                                <filename>/var/log/journal</filename>
+                                hierarchy (which is created if
+                                needed), with a fallback to
+                                <filename>/run/log/journal</filename>
+                                (which is created if needed), during
+                                early boot and if the disk is not
+                                writable. <literal>auto</literal> is
+                                similar to
+                                <literal>permanent</literal> but the
+                                directory
+                                <filename>/var/log/journal</filename>
+                                is not created if needed, so that its
+                                existance controls where log data
+                                goes. <literal>none</literal> turns
+                                off all storage, all log data received
+                                will be dropped. Forwarding to other
+                                targets, such as the console, the
+                                kernel log buffer or a syslog daemon
+                                will still work however.  Defaults to
+                                <literal>auto</literal>.</para></listitem>
+                        </varlistentry>

                 </variablelist>
 
         </refsect1>
                 </variablelist>
 
         </refsect1>