condition: always follow symlinks for condition checks, to mimic test

diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 4e2590d00636c778350e964b887e98595ee54949..4437510df7c08fcba821aba97416df3e50ee5ff7 100644 (file)
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -691,7 +691,7 @@
                                 is prefixed with an exclamation mark
                                 (!), the test is negated, and the unit
                                 is only started if the path does not
                                 is prefixed with an exclamation mark
                                 (!), the test is negated, and the unit
                                 is only started if the path does not

-                                exist. The test follows symlinks.
+                                exist.

                                 <varname>ConditionPathExistsGlob=</varname>
                                 works in a similar way, but checks for
                                 the existence of at least one file or
                                 <varname>ConditionPathExistsGlob=</varname>
                                 works in a similar way, but checks for
                                 the existence of at least one file or


@@ -701,9 +701,8 @@
                                 is similar to
                                 <varname>ConditionPathExists=</varname>
                                 but verifies whether a certain path
                                 is similar to
                                 <varname>ConditionPathExists=</varname>
                                 but verifies whether a certain path

-                                exists and is a directory. It does not
-                                follow
-                                symlinks. <varname>ConditionPathIsMountPoint=</varname>
+                                exists and is a
+                                directory. <varname>ConditionPathIsMountPoint=</varname>

                                 is similar to
                                 <varname>ConditionPathExists=</varname>
                                 but verifies whether a certain path
                                 is similar to
                                 <varname>ConditionPathExists=</varname>
                                 but verifies whether a certain path


@@ -713,7 +712,7 @@
                                 <varname>ConditionPathExists=</varname>
                                 but verifies whether a certain path
                                 exists, is a regular file and marked
                                 <varname>ConditionPathExists=</varname>
                                 but verifies whether a certain path
                                 exists, is a regular file and marked

-                                executable. It follows symlinks.
+                                executable.

                                 <varname>ConditionDirectoryNotEmpty=</varname>
                                 is similar to
                                 <varname>ConditionPathExists=</varname>
                                 <varname>ConditionDirectoryNotEmpty=</varname>
                                 is similar to
                                 <varname>ConditionPathExists=</varname>


@@ -781,7 +780,8 @@
                                 prefix an argument with the pipe
                                 symbol and an exclamation mark the
                                 pipe symbol must be passed first, the
                                 prefix an argument with the pipe
                                 symbol and an exclamation mark the
                                 pipe symbol must be passed first, the

-                                exclamation second.</para></listitem>
+                                exclamation second. All path checks
+                                follow symlinks.</para></listitem>

                         </varlistentry>
 
                         <varlistentry>
                         </varlistentry>
 
                         <varlistentry>

diff --git a/src/condition.c b/src/condition.c
index 131b456806c2282cc9ef7a96a2073ed086f8dc7c..7f8564966a22cdc39dcce79eaa693c445da9d2f3 100644 (file)
--- a/src/condition.c
+++ b/src/condition.c
@@ -162,7 +162,7 @@ bool condition_test(Condition *c) {
         case CONDITION_PATH_IS_DIRECTORY: {
                 struct stat st;
 
         case CONDITION_PATH_IS_DIRECTORY: {
                 struct stat st;
 

-                if (lstat(c->parameter, &st) < 0)
+                if (stat(c->parameter, &st) < 0)

                         return !c->negate;
                 return S_ISDIR(st.st_mode) == !c->negate;
         }
                         return !c->negate;
                 return S_ISDIR(st.st_mode) == !c->negate;
         }