diff options
author | Daniel Mack <daniel@zonque.org> | 2015-04-07 00:44:15 +0200 |
---|---|---|
committer | Daniel Mack <daniel@zonque.org> | 2015-04-07 00:50:10 +0200 |
commit | b604cb9bf6a14d12589e85b82f3f59db93ea0029 (patch) | |
tree | 6b59c44686317c8532e6407a11e1130746e3f15c /src/core/mount-setup.c | |
parent | 84d325800eb11947c78c005ff603ee75600406a6 (diff) |
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.
Diffstat (limited to 'src/core/mount-setup.c')
-rw-r--r-- | src/core/mount-setup.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c index 343ff066a9..71b32d9be7 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; |