From 64f75d7a2898e0c0d2b66f93ddd34ffd345bb3c5 Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Tue, 7 Apr 2015 14:03:44 +0200 Subject: core: fix mount setup to work with non-existing mount points We must not fail on ENOENT. We properly create the mount-point in mount-setup, so there's really no reason to skip the mount. Make sure we just skip the mount on unexpected failures or if it's already mounted. --- src/core/mount-setup.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/core/mount-setup.c') diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c index 71b32d9be7..23fb0a1e38 100644 --- a/src/core/mount-setup.c +++ b/src/core/mount-setup.c @@ -157,12 +157,8 @@ 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) + if (r < 0 && r != -ENOENT) return r; - if (r > 0) return 0; -- cgit v1.2.3-54-g00ecf