mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-09-03 18:29:33 +00:00
Code Issues Releases Wiki Activity

start: move idmapped mount setup later

Browse Source 
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:
Christian Brauner
2021-05-14 19:00:14 +02:00
parent 5b70f02efc
commit e4564b7ef9
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/lxc/start.c
View File

@@ -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)) if (!lxc_sync_wake_child(handler, START_SYNC_STARTUP))
goto out_delete_net; 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)) { if (!lxc_list_empty(&conf->procs)) {
ret = setup_proc_filesystem(&conf->procs, handler->pid); ret = setup_proc_filesystem(&conf->procs, handler->pid);
if (ret < 0) if (ret < 0)