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

Merge pull request #3842 from brauner/2021-05-14.fixes

Browse Source 
start: move idmapped mount setup later
This commit is contained in:
Stéphane Graber
2021-05-14 13:49:18 -04:00
committed by GitHub
parent 5b70f02efc e4564b7ef9
commit 73936a0d5c
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))
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)