2 files changed, 6 insertions, 0 deletions
diff --git a/TODO b/TODO
index 8a5d3a2a04..8e0af57464 100644
--- a/TODO
+++ b/TODO
@@ -80,6 +80,8 @@
 
 * drop tmp.mount
 
+* systemctl condrestart should return 0 if service isn't running
+
 External:
 
 * patch kernel for xattr support in /dev, /proc/, /sys and /sys/fs/cgroup.
diff --git a/src/mount-setup.c b/src/mount-setup.c
index 9eb2832c6e..6efc48e4dc 100644
--- a/src/mount-setup.c
+++ b/src/mount-setup.c
@@ -202,6 +202,10 @@ static int nftw_cb(
                 int tflag,
                 struct FTW *ftwbuf) {
 
+        /* No need to label /dev twice in a row... */
+        if (ftwbuf->level == 0)
+                return 0;
+
         label_fix(fpath);
         return 0;
 };