lxc-start: don't re-try to mount rootfs if we already did so

If we are root using a user namespace and are mounting a blockdev as rootfs, then we do this before unsharing the userns, because we are not allowed to do it in a userns. But after unsharing the userns, we unconditionally retried mounting the rootfs, resulting in failure. stop that. Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com> Acked-by: Stéphane Graber <stgraber@ubuntu.com>

lxc-start: don't re-try to mount rootfs if we already did so
be97c20d · Serge Hallyn · Stéphane Graber · 677a76dd · be97c20d · be97c20d
Commit be97c20d authored Oct 14, 2014 by Serge Hallyn Committed by Stéphane Graber Nov 25, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

conf.c src/lxc/conf.c +2 -1

conf.h src/lxc/conf.h +1 -0

start.c src/lxc/start.c +1 -0

No files found.
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -4014,7 +4014,7 @@ void tmp_proc_unmount(struct lxc_conf *lxc_conf)
 	}
 }

-static void remount_all_slave(void)
+void remount_all_slave(void)
 {
 	/* walk /proc/mounts and change any shared entries to slave */
 	FILE *f = fopen("/proc/self/mountinfo", "r");
@@ -4103,6 +4103,7 @@ static bool verify_start_hooks(struct lxc_conf *conf)
 					hookname);
 			return false;
 		}
+		return true;
 	}

 	return true;

--- a/src/lxc/conf.h
+++ b/src/lxc/conf.h
@@ -399,5 +399,6 @@ extern int userns_exec_1(struct lxc_conf *conf, int (*fn)(void *), void *data);
 extern int parse_mntopts(const char *mntopts, unsigned long *mntflags,
 			 char **mntdata);
 extern void tmp_proc_unmount(struct lxc_conf *lxc_conf);
+void remount_all_slave(void);
 extern void suggest_default_idmap(void);
 #endif
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -1066,6 +1066,7 @@ int __lxc_start(const char *name, struct lxc_conf *conf,
 				ERROR("Error unsharing mounts");
 				goto out_fini_nonet;
 			}
+			remount_all_slave();
 			if (do_rootfs_setup(conf, name, lxcpath) < 0) {
 				ERROR("Error setting up rootfs mount as root before spawn");
 				goto out_fini_nonet;