mount: don't relabel /dev twice in a row

diff --git a/TODO b/TODO
index 8a5d3a2a047b81ff67adbfcd3126d21132c9998d..8e0af57464874570d5757bb201d4f4696e109126 100644 (file)
--- a/TODO
+++ b/TODO
@@ -80,6 +80,8 @@
 
 * drop tmp.mount
 
 
 * 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.
 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 9eb2832c6ecd6935252b10f1fda44146c40623c0..6efc48e4dce8c493e669442ff1ee479b4ffd1d99 100644 (file)
--- a/src/mount-setup.c
+++ b/src/mount-setup.c
@@ -202,6 +202,10 @@ static int nftw_cb(
                 int tflag,
                 struct FTW *ftwbuf) {
 
                 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;
 };
         label_fix(fpath);
         return 0;
 };