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

start: move idmapped mount setup later

Merge pull request #3842 from brauner/2021-05-14.fixes
73936a0d · Stéphane Graber · GitHub · 5b70f02e · e4564b7e · 73936a0d
Unverified Commit 73936a0d authored May 14, 2021 by Stéphane Graber Committed by GitHub May 14, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

start.c src/lxc/start.c +6 -6

No files found.
--- 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)