[systemd-commits] 2 commits - Makefile.am man/systemd-journald.service.xml

[Zbigniew Jędrzejewski-Szmek]

 Makefile.am                      |    2 +-
 man/systemd-journald.service.xml |   14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit e7c431d3bcfdeeec5dcae0707145edb9a3f749aa
Author: Holger Hans Peter Freyther <holger at moiji-mobile.com>
Date:   Thu Jul 18 09:18:55 2013 +0200

    make: Automake is complaining about .PRECIOUS being redefined
    
    Yesterday I added test-suite.log as dependency to the .PRECIOUS
    target. Automake is warning about this target being redefined
    and from what I see there is no way I can stop the warning but
    I can add the %MAKEFILE% as dependency.
    
    automake warning:
    Makefile.am:35: warning: user target '.PRECIOUS' defined here ...
    /usr/share/automake-1.13/am/configure.am: ... overrides Automake target '.PRECIOUS' defined here
    
    [zj: s/%MAKEFILE%/Makefile/ because %MAKEFILE% wasn't actually substituted properly.]

diff --git a/Makefile.am b/Makefile.am
index c4b9b1a..3ece887 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,7 +32,7 @@ SUBDIRS = . po
 .SECONDARY:
 
 # Keep the test-suite.log
-.PRECIOUS: $(TEST_SUITE_LOG)
+.PRECIOUS: $(TEST_SUITE_LOG) Makefile
 
 LIBUDEV_CURRENT=4
 LIBUDEV_REVISION=6

commit d4d60b316914770e9e671122394f96521841eac7
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Fri Jul 19 19:04:08 2013 -0400

    man: also mention /run/log/journal in systemd-jouranld.service(8)

diff --git a/man/systemd-journald.service.xml b/man/systemd-journald.service.xml
index 45091c6..5634dd0 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>