path-util: fix more path_is_mount e792e890f fallout

This commit is contained in:
Lennart Poettering
2015-04-07 16:03:45 +02:00
parent 2c0223282d
commit da00518b3f
4 changed files with 16 additions and 10 deletions
+2 -2
View File
@@ -889,7 +889,7 @@ static int mount_all(const char *dest) {
return log_oom();
t = path_is_mount_point(where, true);
if (t < 0) {
if (t < 0 && t != -ENOENT) {
log_error_errno(t, "Failed to detect whether %s is a mount point: %m", where);
if (r == 0)
@@ -1028,7 +1028,7 @@ static int mount_cgroup_hierarchy(const char *dest, const char *controller, cons
to = strjoina(dest, "/sys/fs/cgroup/", hierarchy);
r = path_is_mount_point(to, false);
if (r < 0)
if (r < 0 && r != -ENOENT)
return log_error_errno(r, "Failed to determine if %s is mounted already: %m", to);
if (r > 0)
return 0;