From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 11 Nov 2010 00:22:42 +0000 (+0100)
Subject: mount: don't relabel /dev twice in a row
X-Git-Tag: v12~59
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=9fe117ea5ac7e8fc36312324c7fdc851adff59f3

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

diff --git a/TODO b/TODO
index 8a5d3a2a0..8e0af5746 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 9eb2832c6..6efc48e4d 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;
 };