start: move idmapped mount setup later

At the prior location we we're placed between sending and receiving
networking information over the data socket causing the startup to fail.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/src/lxc/start.c b/src/lxc/start.c
index a6e4e57d141de3c5c79c812c2171aae77e13dee4..e3ed26d0a07ad38da756a23ca9b68b7063552cbc 100644 (file)
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -1786,12 +1786,6 @@ static int lxc_spawn(struct lxc_handler *handler)
                }
        }
 
-       ret = lxc_rootfs_prepare_parent(handler);
-       if (ret) {
-               ERROR("Failed to prepare rootfs");
-               goto out_delete_net;
-       }
-
        if (!lxc_sync_wake_child(handler, START_SYNC_STARTUP))
                goto out_delete_net;
 
@@ -1852,6 +1846,12 @@ static int lxc_spawn(struct lxc_handler *handler)
                }
        }
 
+       ret = lxc_rootfs_prepare_parent(handler);
+       if (ret) {
+               ERROR("Failed to prepare rootfs");
+               goto out_delete_net;
+       }
+
        if (!lxc_list_empty(&conf->procs)) {
                ret = setup_proc_filesystem(&conf->procs, handler->pid);
                if (ret < 0)