[systemd-commits] 2 commits - man/tmpfiles.d.xml src/libsystemd

[Zbigniew Jędrzejewski-Szmek]

 man/tmpfiles.d.xml                  |   29 ++++++++++++++---------------
 src/libsystemd/sd-rtnl/rtnl-types.c |    1 +
 2 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit e410b07d2aa64a653bc0e93b77856af41297b84d
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Mon Feb 23 20:03:55 2015 -0500

    libsystemd: revert one hunk of duplicate ifdef removal
    
    This change exposed a bug in kernel headers:
    
    /usr/include/linux/if_bridge.h:184:20: error: field 'ip6' has incomplete type
        struct in6_addr ip6;
                        ^
    /usr/include/linux/if_tunnel.h:76:19: error: field 'prefix' has incomplete type
      struct in6_addr  prefix;
                       ^

diff --git a/src/libsystemd/sd-rtnl/rtnl-types.c b/src/libsystemd/sd-rtnl/rtnl-types.c
index 3f4ba2e..2257c81 100644
--- a/src/libsystemd/sd-rtnl/rtnl-types.c
+++ b/src/libsystemd/sd-rtnl/rtnl-types.c
@@ -23,6 +23,7 @@
 #include <sys/socket.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
+#include <linux/in6.h>
 #include <linux/veth.h>
 #include <linux/if_bridge.h>
 #include <linux/if_addr.h>

commit 00c53f4283ca41878a84b370840a84760b00d46e
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Mon Feb 23 18:59:17 2015 -0500

    man: explain time units in tmpfiles
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1195294

diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
index 8815bf9..4bd0fcf 100644
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -443,23 +443,22 @@
       delete when cleaning. If a file or directory is older than the
       current time minus the age field, it is deleted. The field
       format is a series of integers each followed by one of the
-      following postfixes for the respective time units:</para>
-
-      <variablelist>
-        <varlistentry>
-          <term><varname>s</varname></term>
-          <term><varname>min</varname></term>
-          <term><varname>h</varname></term>
-          <term><varname>d</varname></term>
-          <term><varname>w</varname></term>
-          <term><varname>ms</varname></term>
-          <term><varname>m</varname></term>
-        <term><varname>us</varname></term></varlistentry>
-      </variablelist>
+      following postfixes for the respective time units:
+      <constant>s</constant>,
+      <constant>m</constant> or <constant>min</constant>,
+      <constant>h</constant>,
+      <constant>d</constant>,
+      <constant>w</constant>,
+      <constant>ms</constant>,
+      <constant>us</constant>,
+      respectively meaning seconds, minutes, hours, days, weeks,
+      milliseconds, and microseconds. Full names of the time units can
+      be used too.
+      </para>
 
       <para>If multiple integers and units are specified, the time
-      values are summed up. If an integer is given without a unit,
-      <varname>s</varname> is assumed.
+      values are summed. If an integer is given without a unit,
+      <constant>s</constant> is assumed.
       </para>
 
       <para>When the age is set to zero, the files are cleaned