From: Serge Hallyn <serge.hallyn@ubuntu.com>
Date: Mon, 27 Oct 2014 03:01:30 +0000 (-0500)
Subject: do_rootfs_setup: fix return bugs
X-Git-Tag: lxc-1.1.0.alpha3~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=145832ba8b1dfd0b53436e6b61ef112bbdd50c6c;p=thirdparty%2Flxc.git

do_rootfs_setup: fix return bugs

Fix return value on bind mount failure.

If we've already mounted the rootfs, exit after the bind mount
rather than re-trying the rootfs mount.  The only case where
this happens is when root is starting a container in a user
namespace and with a block device backing store.

In that case, pre-mount hooks will be executed in the initial
user namespace.  That may be worth fixing.  Or it may be what
we want.  We should think about it and fix it.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 9ba18fe88..dc790a304 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -3984,8 +3984,9 @@ int do_rootfs_setup(struct lxc_conf *conf, const char *name, const char *lxcpath
 		const char *path = conf->rootfs.mount;
 		if (mount(path, path, "rootfs", MS_BIND, NULL) < 0) {
 			ERROR("Failed to bind-mount container / onto itself");
-			return false;
+			return -1;
 		}
+		return 0;
 	}
 
 	remount_all_slave();