aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-07-19 19:04:08 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-07-19 19:04:19 -0400
commitd4d60b316914770e9e671122394f96521841eac7 (patch)
tree31c24d50722f9c00ec9bcf1dc74332410a9e64fc
parentjournald: after the cgroup rework processes may be in both user and system un... (diff)
downloadsystemd-d4d60b316914770e9e671122394f96521841eac7.tar.gz
systemd-d4d60b316914770e9e671122394f96521841eac7.tar.bz2
systemd-d4d60b316914770e9e671122394f96521841eac7.zip
man: also mention /run/log/journal in systemd-jouranld.service(8)
-rw-r--r--man/systemd-journald.service.xml14
1 files changed, 13 insertions, 1 deletions
diff --git a/man/systemd-journald.service.xml b/man/systemd-journald.service.xml
index 45091c62a..5634dd0a2 100644
--- a/man/systemd-journald.service.xml
+++ b/man/systemd-journald.service.xml
@@ -206,11 +206,15 @@
</varlistentry>
<varlistentry>
+ <term><filename>/run/log/journal/<replaceable>machine-id</replaceable>/*.journal</filename></term>
+ <term><filename>/run/log/journal/<replaceable>machine-id</replaceable>/*.journal~</filename></term>
<term><filename>/var/log/journal/<replaceable>machine-id</replaceable>/*.journal</filename></term>
<term><filename>/var/log/journal/<replaceable>machine-id</replaceable>/*.journal~</filename></term>
<listitem><para><command>systemd-journald</command>
writes entries to files in
+ <filename>/run/log/journal/<replaceable>machine-id</replaceable>/</filename>
+ or
<filename>/var/log/journal/<replaceable>machine-id</replaceable>/</filename>
with the <literal>.journal</literal>
suffix. If the daemon is stopped
@@ -219,7 +223,15 @@
using the <literal>.journal~</literal>
suffix, and
<command>systemd-journald</command>
- starts writing to a new file.
+ starts writing to a new
+ file. <filename>/run</filename> is
+ used when
+ <filename>/var/log/journal</filename>
+ is not available, or when
+ <option>Storage=volatile</option> is
+ set in the
+ <citerefentry><refentrytitle>journald.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+ configuration file.
</para></listitem>
</varlistentry>
</variablelist>