Prevent from error on umount /proc if userns are used.

Signed-off-by: Przemek Rudy <prudy1@o2.pl> Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>

Prevent from error on umount /proc if userns are used.
4a5911e8 · Przemek Rudy · Stéphane Graber · 5035cbc7 · 4a5911e8
Commit 4a5911e8 authored Jul 29, 2015 by Przemek Rudy Committed by Stéphane Graber Aug 13, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

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

No files found.
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -1368,10 +1368,8 @@ int prepare_ramfs_root(char *root)
 			break;
 	}
-	if (umount2("./proc", MNT_DETACH)) {
+	/* This also can be skipped if a container uses unserns */
-		SYSERROR("Unable to umount /proc");
+	umount2("./proc", MNT_DETACH);
-		return -1;
-	}
 	/* It is weird, but chdir("..") moves us in a new root */
 	if (chdir("..") == -1) {