From: Daniel Mack <daniel@zonque.org>
Date: Mon, 6 Apr 2015 22:44:15 +0000 (+0200)
Subject: core: mount-setup: handle non-existing mountpoints gracefully
X-Git-Tag: v220~573
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b604cb9bf6a14d12589e85b82f3f59db93ea0029;p=thirdparty%2Fsystemd.git

core: mount-setup: handle non-existing mountpoints gracefully

Commit e792e890f ("path-util: don't eat up ENOENT in
path_is_mount_point()") changed path_is_mount_point() so it doesn't hide
-ENOENT from its caller. This causes all boots to fail early in case
any of the mount points does not exist (for instance, when kdbus isn't
loaded, /sys/fs/kdbus is missing).

Fix this by returning 0 from mount_one() if path_is_mount_point()
returned -ENOENT.
---

diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
index 343ff066a97..71b32d9be72 100644
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -157,6 +157,9 @@ static int mount_one(const MountPoint *p, bool relabel) {
                 label_fix(p->where, true, true);
 
         r = path_is_mount_point(p->where, true);
+        if (r == -ENOENT)
+                return 0;
+
         if (r < 0)
                 return r;