mirror of
git://github.com/lxc/lxc
synced 2025-08-31 20:17:17 +00:00
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>
This commit is contained in:
@@ -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)
|
||||
|
Reference in New Issue
Block a user