Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
core: mount-setup: handle non-existing mountpoints gracefully
Commit e792e89 ("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.
  • Loading branch information
zonque committed Apr 6, 2015
1 parent 84d3258 commit b604cb9
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/core/mount-setup.c
Expand Up @@ -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;

Expand Down

0 comments on commit b604cb9

Please sign in to comment.