Skip to content

L
lxc
Unverified Commit e4564b7e by Christian Brauner
Options

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: 's avatarChristian Brauner <christian.brauner@ubuntu.com>
parent 5b70f02e
Showing with 6 additions and 6 deletions
src/lxc/start.c
...@@ -1786,12 +1786,6 @@ static int lxc_spawn(struct lxc_handler *handler) ...@@ -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) ...@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment