|
 |
9ab0c5 |
From a4f13a2fdf5cf1650edbb02ac0393c6815ef472c Mon Sep 17 00:00:00 2001
|
|
|
9ab0c5 |
From: Lennart Poettering <lennart@poettering.net>
|
|
|
9ab0c5 |
Date: Tue, 7 Apr 2015 16:03:45 +0200
|
|
|
9ab0c5 |
Subject: [PATCH] path-util: fix more path_is_mount e792e890f fallout
|
|
|
9ab0c5 |
|
|
|
9ab0c5 |
(cherry picked from commit da00518b3f3a8b08d521c4b72068eafa2db566cc)
|
|
|
9ab0c5 |
|
|
|
9ab0c5 |
Resolves: #1279231
|
|
|
9ab0c5 |
---
|
|
|
9ab0c5 |
src/core/automount.c | 6 ++----
|
|
|
9ab0c5 |
src/nspawn/nspawn.c | 2 +-
|
|
|
9ab0c5 |
src/shared/cgroup-util.c | 6 ++++--
|
|
|
9ab0c5 |
src/test/test-path-util.c | 10 ++++++++--
|
|
|
9ab0c5 |
4 files changed, 15 insertions(+), 9 deletions(-)
|
|
|
9ab0c5 |
|
|
|
9ab0c5 |
diff --git a/src/core/automount.c b/src/core/automount.c
|
|
|
9ab0c5 |
index 7b9c4aaf1d..2d6f5f3a77 100644
|
|
|
9ab0c5 |
--- a/src/core/automount.c
|
|
|
9ab0c5 |
+++ b/src/core/automount.c
|
|
|
9ab0c5 |
@@ -789,10 +789,8 @@ static int automount_start(Unit *u) {
|
|
|
9ab0c5 |
assert(a);
|
|
|
9ab0c5 |
assert(a->state == AUTOMOUNT_DEAD || a->state == AUTOMOUNT_FAILED);
|
|
|
9ab0c5 |
|
|
|
9ab0c5 |
- if (path_is_mount_point(a->where, false)) {
|
|
|
9ab0c5 |
- log_unit_error(u->id,
|
|
|
9ab0c5 |
- "Path %s is already a mount point, refusing start for %s",
|
|
|
9ab0c5 |
- a->where, u->id);
|
|
|
9ab0c5 |
+ if (path_is_mount_point(a->where, false) > 0) {
|
|
|
9ab0c5 |
+ log_unit_error(u->id, "Path %s is already a mount point, refusing start for %s", a->where, u->id);
|
|
|
9ab0c5 |
return -EEXIST;
|
|
|
9ab0c5 |
}
|
|
|
9ab0c5 |
|
|
|
9ab0c5 |
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
|
|
|
9ab0c5 |
index ee2e1832f1..e7ecee8674 100644
|
|
|
9ab0c5 |
--- a/src/nspawn/nspawn.c
|
|
|
9ab0c5 |
+++ b/src/nspawn/nspawn.c
|
|
|
9ab0c5 |
@@ -864,7 +864,7 @@ static int mount_all(const char *dest) {
|
|
|
9ab0c5 |
return log_oom();
|
|
|
9ab0c5 |
|
|
|
9ab0c5 |
t = path_is_mount_point(where, true);
|
|
|
9ab0c5 |
- if (t < 0) {
|
|
|
9ab0c5 |
+ if (t < 0 && t != -ENOENT) {
|
|
|
9ab0c5 |
log_error_errno(t, "Failed to detect whether %s is a mount point: %m", where);
|
|
|
9ab0c5 |
|
|
|
9ab0c5 |
if (r == 0)
|
|
|
9ab0c5 |
diff --git a/src/shared/cgroup-util.c b/src/shared/cgroup-util.c
|
|
|
9ab0c5 |
index 4585450b39..f1bed8a25a 100644
|
|
|
9ab0c5 |
--- a/src/shared/cgroup-util.c
|
|
|
9ab0c5 |
+++ b/src/shared/cgroup-util.c
|
|
|
9ab0c5 |
@@ -489,8 +489,10 @@ int cg_get_path(const char *controller, const char *path, const char *suffix, ch
|
|
|
9ab0c5 |
int r;
|
|
|
9ab0c5 |
|
|
|
9ab0c5 |
r = path_is_mount_point("/sys/fs/cgroup", false);
|
|
|
9ab0c5 |
- if (r <= 0)
|
|
|
9ab0c5 |
- return r < 0 ? r : -ENOENT;
|
|
|
9ab0c5 |
+ if (r < 0)
|
|
|
9ab0c5 |
+ return r;
|
|
|
9ab0c5 |
+ if (r == 0)
|
|
|
9ab0c5 |
+ return -ENOENT;
|
|
|
9ab0c5 |
|
|
|
9ab0c5 |
/* Cache this to save a few stat()s */
|
|
|
9ab0c5 |
good = true;
|
|
|
9ab0c5 |
diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c
|
|
|
9ab0c5 |
index aee1f4e036..aebfa3821d 100644
|
|
|
9ab0c5 |
--- a/src/test/test-path-util.c
|
|
|
9ab0c5 |
+++ b/src/test/test-path-util.c
|
|
|
9ab0c5 |
@@ -86,8 +86,14 @@ static void test_path(void) {
|
|
|
9ab0c5 |
test_parent("/aa///file...", "/aa///");
|
|
|
9ab0c5 |
test_parent("file.../", NULL);
|
|
|
9ab0c5 |
|
|
|
9ab0c5 |
- assert_se(path_is_mount_point("/", true));
|
|
|
9ab0c5 |
- assert_se(path_is_mount_point("/", false));
|
|
|
9ab0c5 |
+ assert_se(path_is_mount_point("/", true) > 0);
|
|
|
9ab0c5 |
+ assert_se(path_is_mount_point("/", false) > 0);
|
|
|
9ab0c5 |
+
|
|
|
9ab0c5 |
+ assert_se(path_is_mount_point("/proc", true) > 0);
|
|
|
9ab0c5 |
+ assert_se(path_is_mount_point("/proc", false) > 0);
|
|
|
9ab0c5 |
+
|
|
|
9ab0c5 |
+ assert_se(path_is_mount_point("/sys", true) > 0);
|
|
|
9ab0c5 |
+ assert_se(path_is_mount_point("/sys", false) > 0);
|
|
|
9ab0c5 |
|
|
|
9ab0c5 |
{
|
|
|
9ab0c5 |
char p1[] = "aaa/bbb////ccc";
|