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 a7d090429c50d343ace4fd9d960f6a6676c195f3..f2215a8afb6834bd28e10dcbbbe68570edccb32b 100644 (file)
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -4063,8 +4063,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();