Only mount /proc if needed, even without a rootfs

Use the same code with and without a rootfs to check if mounting /proc is necessary before doing so. If mounting it is unsuccessful and there is no rootfs, continue as before. Signed-off-by: David Ward <david.ward@ll.mit.edu> Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>

Only mount /proc if needed, even without a rootfs
9bcf970f · David Ward · Stéphane Graber · b8e98f06 · 9bcf970f
Commit 9bcf970f authored Jun 23, 2015 by David Ward Committed by Stéphane Graber Aug 27, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 9 deletions

conf.c src/lxc/conf.c +4 -9

No files found.
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -3484,17 +3484,12 @@ int tmp_proc_mount(struct lxc_conf *lxc_conf)
 {
 	int mounted;
-	if (lxc_conf->rootfs.path == NULL || strlen(lxc_conf->rootfs.path) == 0) {
+	mounted = mount_proc_if_needed(lxc_conf->rootfs.path ? lxc_conf->rootfs.mount : "");
-		if (mount("proc", "/proc", "proc", 0, NULL)) {
-			SYSERROR("Failed mounting /proc, proceeding");
-			mounted = 0;
-		} else
-			mounted = 1;
-	} else
-		mounted = mount_proc_if_needed(lxc_conf->rootfs.mount);
 	if (mounted == -1) {
 		SYSERROR("failed to mount /proc in the container.");
-		return -1;
+		/* continue only if there is no rootfs */
+		if (lxc_conf->rootfs.path)
+			return -1;
 	} else if (mounted == 1) {
 		lxc_conf->tmp_umount_proc = 1;
 	}