[systemd-commits] src/core

[Daniel Mack]

 src/core/mount-setup.c |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit b604cb9bf6a14d12589e85b82f3f59db93ea0029
Author: Daniel Mack <daniel at zonque.org>
Date:   Tue Apr 7 00:44:15 2015 +0200

    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 343ff06..71b32d9 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;