label: udev might be making changes in /dev while we iterate through it

[elogind.git] / src / tmpfiles.c

diff --git a/src/tmpfiles.c b/src/tmpfiles.c
index 01668da87e142c8a3711424e1c05e47c55080425..0302262394ef1f694f6f6745a62bc633961832c8 100644 (file)
--- a/src/tmpfiles.c
+++ b/src/tmpfiles.c
@@ -147,6 +147,8 @@ static void load_unix_sockets(void) {
                 if (!(s = strdup(p)))
                         goto fail;
 
+                path_kill_slashes(s);
+
                 if ((k = set_put(unix_sockets, s)) < 0) {
                         free(s);
 
@@ -301,6 +303,10 @@ static int dir_cleanup(
                         if (S_ISSOCK(s.st_mode) && unix_socket_alive(sub_path))
                                 continue;
 
+                        /* Ignore device nodes */
+                        if (S_ISCHR(s.st_mode) || S_ISBLK(s.st_mode))
+                                continue;
+
                         age = MAX3(timespec_load(&s.st_mtim),
                                    timespec_load(&s.st_atim),
                                    timespec_load(&s.st_ctim));
@@ -501,7 +507,7 @@ static int create_item(Item *i) {
                 break;
         }
 
-        if ((r = label_fix(i->path)) < 0)
+        if ((r = label_fix(i->path, false)) < 0)
                 goto finish;
 
         log_debug("%s created successfully.", i->path);