conf.c: if we don't specify a rootfs, we still need proc mounted

otherwise we won't be allowed to set an apparmor context (on pid 1) Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com> Acked-by: Stéphane Graber <stgraber@ubuntu.com>

conf.c: if we don't specify a rootfs, we still need proc mounted
6e46cfcb · Serge Hallyn · fabf7361 · 6e46cfcb
Commit 6e46cfcb authored Jun 10, 2013 by Serge Hallyn
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

conf.c src/lxc/conf.c +7 -3

No files found.
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -2851,9 +2851,13 @@ int lxc_setup(const char *name, struct lxc_conf *lxc_conf)
 #if HAVE_APPARMOR /* || HAVE_SMACK || HAVE_SELINUX */
 	INFO("rootfs path is .%s., mount is .%s.", lxc_conf->rootfs.path,
 		lxc_conf->rootfs.mount);
-	if (lxc_conf->rootfs.path == NULL || strlen(lxc_conf->rootfs.path) == 0)
+	if (lxc_conf->rootfs.path == NULL || strlen(lxc_conf->rootfs.path) == 0) {
-		mounted = 0;
+		if (mount("proc", "/proc", "proc", 0, NULL)) {
-	else
+			SYSERROR("Failed mounting /proc, proceeding");
+			mounted = 0;
+		} else
+			mounted = 1;
+	} else
 		mounted = lsm_mount_proc_if_needed(lxc_conf->rootfs.path, lxc_conf->rootfs.mount);
 	if (mounted == -1) {
 		SYSERROR("failed to mount /proc in the container.");