fix mounts not propagating back to root mntns during create and clone

Systems based on systemd mount the root shared by default. We don't want mounts done during creation by templates nor those done internally by bdev during rsync based clones to propagate to the root mntns. The create case already had the right check, but the mount call was missing "/", so it was failing. Signed-off-by: Dwight Engen <dwight.engen@oracle.com> Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>

fix mounts not propagating back to root mntns during create and clone
c597baa8 · Dwight Engen · Stéphane Graber · f88bfaa3 · c597baa8 · c597baa8
Commit c597baa8 authored Feb 19, 2014 by Dwight Engen Committed by Stéphane Graber Feb 19, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

bdev.c src/lxc/bdev.c +6 -0

lxccontainer.c src/lxc/lxccontainer.c +1 -1

No files found.
--- a/src/lxc/bdev.c
+++ b/src/lxc/bdev.c
@@ -2387,6 +2387,12 @@ static int rsync_rootfs(struct rsync_data *data)
 		SYSERROR("unshare CLONE_NEWNS");
 		return -1;
 	}
+	if (detect_shared_rootfs()) {
+		if (mount(NULL, "/", NULL, MS_SLAVE|MS_REC, NULL)) {
+			SYSERROR("Failed to make / rslave to run rsync");
+			ERROR("Continuing...");
+		}
+	}
 	// If not a snapshot, copy the fs.
 	if (orig->ops->mount(orig) < 0) {

--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -913,7 +913,7 @@ static bool create_run_template(struct lxc_container *c, char *tpath, bool quiet
 				exit(1);
 			}
 			if (detect_shared_rootfs()) {
-				if (mount("", "", NULL, MS_SLAVE|MS_REC, 0)) {
+				if (mount(NULL, "/", NULL, MS_SLAVE|MS_REC, NULL)) {
 					SYSERROR("Failed to make / rslave to run template");
 					ERROR("Continuing...");
 				}