main: disarm watchdog when preparing for reexecution

[elogind.git] / src / tmpfiles.c

diff --git a/src/tmpfiles.c b/src/tmpfiles.c
index f3c38a84339229c48eb68c61891934c0518283db..5e85e37411b55ea22a4f83d4a37a7aaa5858f345 100644 (file)
--- a/src/tmpfiles.c
+++ b/src/tmpfiles.c
@@ -41,6 +41,7 @@
 
 #include "log.h"
 #include "util.h"
+#include "mkdir.h"
 #include "strv.h"
 #include "label.h"
 #include "set.h"
@@ -893,7 +894,7 @@ static bool item_equal(Item *a, Item *b) {
              a->type == TRUNCATE_FILE ||
              a->type == WRITE_FILE ||
              a->type == CREATE_SYMLINK) &&
-            !streq(a->argument, b->argument))
+            !streq_ptr(a->argument, b->argument))
                 return false;
 
         if ((a->type == CREATE_CHAR_DEVICE ||
@@ -1271,8 +1272,8 @@ int main(int argc, char *argv[]) {
                 char **files, **f;
 
                 r = conf_files_list(&files, ".conf",
-                                    "/run/tmpfiles.d",
                                     "/etc/tmpfiles.d",
+                                    "/run/tmpfiles.d",
                                     "/usr/local/lib/tmpfiles.d",
                                     "/usr/lib/tmpfiles.d",
                                     NULL);