[systemd-commits] 2 commits - man/systemd.unit.xml tmpfiles.d/systemd.conf TODO

[Lennart Poettering]

 TODO                    |    2 --
 man/systemd.unit.xml    |   10 ++++++++--
 tmpfiles.d/systemd.conf |    5 ++++-
 3 files changed, 12 insertions(+), 5 deletions(-)

New commits:
commit e1ab991283ca1072d29e21d8af76e992b663ad9b
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Apr 1 00:43:28 2011 +0200

    tmpfiles: enforce new /var/lock semantics
    
    http://lists.freedesktop.org/archives/systemd-devel/2011-March/001823.html

diff --git a/tmpfiles.d/systemd.conf b/tmpfiles.d/systemd.conf
index e77cf7d..31fd97f 100644
--- a/tmpfiles.d/systemd.conf
+++ b/tmpfiles.d/systemd.conf
@@ -7,10 +7,13 @@
 
 # See tmpfiles.d(5) for details
 
-d /run/lock 0775 root lock -
+d /run/lock 0755 root root -
 d /run/lock/subsys 0755 root root -
+d /run/lock/lockdev 0775 root lock -
+
 d /run/user 0755 root root 10d
 F /run/utmp 0664 root utmp -
+
 f /var/log/wtmp 0664 root utmp -
 f /var/log/btmp 0600 root utmp -
 

commit c61e77d3eab2385fc7bbae0edef6b3c583a70ca8
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Apr 1 00:42:57 2011 +0200

    man: document ConditionPathIsDirectory=

diff --git a/TODO b/TODO
index c5222ba..651e646 100644
--- a/TODO
+++ b/TODO
@@ -23,8 +23,6 @@ F15:
 
 * fix alsa mixer restore to not print error when no config is stored
 
-* ConditionDirectoryNotEmpty= needs to be documented
-
 Features:
 
 * tmpfiles should allow two identical lines
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index d447c3a..47ddece 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -561,6 +561,7 @@
 
                         <varlistentry>
                                 <term><varname>ConditionPathExists=</varname></term>
+                                <term><varname>ConditionPathIsDirectory=</varname></term>
                                 <term><varname>ConditionDirectoryNotEmpty=</varname></term>
                                 <term><varname>ConditionKernelCommandLine=</varname></term>
                                 <term><varname>ConditionVirtualization=</varname></term>
@@ -584,10 +585,15 @@
                                 is prefixed with an exclamation mark
                                 (!), the test is negated, and the unit
                                 only started if the path does not
-                                exist. <varname>ConditionDirectoryNotEmpty=</varname>
+                                exist. <varname>ConditionPathIsDirectory=</varname>
                                 is similar to
                                 <varname>ConditionPathExists=</varname>
-                                but verifies whether a certain path is
+                                but verifies whether a certain path
+                                exists and is a directory.
+                                <varname>ConditionDirectoryNotEmpty=</varname>
+                                is similar to
+                                <varname>ConditionPathExists=</varname>
+                                but verifies whether a certain path
                                 exists and is a non-empty
                                 directory. Similarly
                                 <varname>ConditionKernelCommandLine=</varname>