1 From 1d0fc58bea018b561a9695b9f9f05203a399ca48 Mon Sep 17 00:00:00 2001
2 From: Alexander Sulfrian <alexander@sulfrian.net>
3 Date: Sat, 23 Jul 2016 04:30:34 +0200
4 Subject: [PATCH 2/3] cleanupmount: Setup the new root as slave mount
6 We want to propagate mounts from the parent namespaces into the vserver
7 (something like vmount or mount within vnamespace), but we do not want to
8 propagate the changes from the vserver back to the parent namespace.
10 lib_internal/util-cleanupmount.c | 8 ++++----
11 1 file changed, 4 insertions(+), 4 deletions(-)
13 diff --git a/lib_internal/util-cleanupmount.c b/lib_internal/util-cleanupmount.c
14 index f1984bc2..4b7b4131 100644
15 --- a/lib_internal/util-cleanupmount.c
16 +++ b/lib_internal/util-cleanupmount.c
22 -#define MS_PRIVATE (1<<18)
24 +#define MS_SLAVE (1<<19)
27 bool cleanupMount(void)
28 @@ -37,9 +37,9 @@ bool cleanupMount(void)
30 /* systemd mounts everything with MS_SHARED which breaks our
31 * filesystem mounting. Revert mount status back to pre-systemd */
32 - rc = mount(NULL, "/", NULL, MS_REC|MS_PRIVATE, NULL) >= 0;
33 + rc = mount(NULL, "/", NULL, MS_REC|MS_SLAVE, NULL) >= 0;
35 - perror("mount(\"/\", MS_REC|MS_PRIVATE)");
36 + perror("mount(\"/\", MS_REC|MS_SLAVE)");
41 From 56d2df4f2a4d47471bda42c42d11ce4564937d69 Mon Sep 17 00:00:00 2001
42 From: Alexander Sulfrian <alexander@sulfrian.net>
43 Date: Sat, 23 Jul 2016 04:38:44 +0200
44 Subject: [PATCH 3/3] Revert "Revert "call cleanupMount() after CLONE_NEWNS""
46 This reverts commit 9877e4b94786125cfcdda8471336a6e73000aa17.
48 After we fixed the cleanupMount using the correct shared subtree semantic,
49 we can start using it again.
53 2 files changed, 4 insertions(+)
55 diff --git a/src/vcontext.c b/src/vcontext.c
56 index 85204f63..0e81a05b 100644
59 @@ -313,6 +313,8 @@ doit(struct Arguments const *args, int argc, char *argv[])
60 perror(ENSC_WRAPPERS_PREFIX "unshare(NEWNS)");
61 return wrapper_exit_code;
63 + if (!cleanupMount())
64 + return wrapper_exit_code;
65 if (mkdir("./.oldroot", 0700) == -1) {
68 diff --git a/src/vspace.c b/src/vspace.c
69 index 37ac2c39..a3ec97b5 100644
72 @@ -137,6 +137,8 @@ newSpaces(uint_least64_t mask)
73 perror(ENSC_WRAPPERS_PREFIX "clone()");
74 exit(wrapper_exit_code);
76 + if (mask & CLONE_NEWNS)
80 vc_exitLikeProcess(pid, wrapper_exit_code);