From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 3 Aug 2020 11:22:01 +0000 (+0200)
Subject: man: describe that changing Storage= does not move existing data
X-Git-Tag: v247-rc1~453^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f254abcd72b6ca6c4567c245a7dbaf739d02dfc2;p=thirdparty%2Fsystemd.git

man: describe that changing Storage= does not move existing data

Fixes #16384.
---

diff --git a/man/journald.conf.xml b/man/journald.conf.xml
index bfd359a903e..d792ef7220f 100644
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -67,12 +67,18 @@
         <literal>persistent</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>persistent</literal> but the
-        directory <filename>/var/log/journal</filename> is not created if needed, so that its existence
-        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
-        socket will still work however. Defaults to <literal>auto</literal> in the default journal namespace,
-        and <literal>persistent</literal> in all others.</para></listitem>
+        is not writable. <literal>auto</literal> behaves like <literal>persistent</literal> if the
+        <filename>/var/log/journal</filename> directory exists, and <literal>volatile</literal> otherwise
+        (the existence of the directory controls the storage mode). <literal>none</literal> turns off all
+        storage, all log data received will be dropped (but forwarding to other targets, such as the console,
+        the kernel log buffer, or a syslog socket will still work). Defaults to <literal>auto</literal> in
+        the default journal namespace, and <literal>persistent</literal> in all others.</para>
+
+        <para>Note that when this option is changed to <literal>volatile</literal>, existing persistent data
+        is not removed. In the other direction,
+        <citerefentry><refentrytitle>journalctl</refentrytitle><manvolnum>1</manvolnum></citerefentry> with
+        the <option>--flush</option> option may be used to move volatile data to persistent storage.</para>
+        </listitem>
       </varlistentry>
 
       <varlistentry>