summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2018-07-29 00:42:41 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2018-08-06 12:51:33 +0900
commit839f18775317bb2e9f8f46588d6f79ca09547e8a (patch)
treed5c0b3691af635c89b47cb5fb62aa5d7cc118d2b /src
parent9b68367b3a076c168c9f0e8659d0122237a55197 (diff)
downloadsystemd-839f18775317bb2e9f8f46588d6f79ca09547e8a.tar.gz
core/namespace: drop mount points outside of root even if RootDirectory= is not set
Diffstat (limited to 'src')
-rw-r--r--src/core/namespace.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/namespace.c b/src/core/namespace.c
index c1ee84779a..201192a5a5 100644
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -1276,7 +1276,7 @@ int setup_namespace(
if (r < 0)
goto finish;
- normalize_mounts(root_directory, mounts, &n_mounts);
+ normalize_mounts(root, mounts, &n_mounts);
}
if (unshare(CLONE_NEWNS) < 0) {
@@ -1375,7 +1375,7 @@ int setup_namespace(
if (!again)
break;
- normalize_mounts(root_directory, mounts, &n_mounts);
+ normalize_mounts(root, mounts, &n_mounts);
}
/* Create a blacklist we can pass to bind_mount_recursive() */