From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 5 Mar 2019 17:57:53 +0000 (+0100)
Subject: nspawn: move payload to sub-cgroup first, then sync cgroup trees
X-Git-Tag: v242-rc1~185
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=27da7ef0d09e00eae821f3ef26e1a666fe7aa087;p=thirdparty%2Fsystemd.git

nspawn: move payload to sub-cgroup first, then sync cgroup trees

if we sync the legacy and unified trees before moving to the right
subcgroup then ultimately the cgroup paths in the hierarchies will be
out-of-sync... Hence, let's move the payload first, and sync then.

Addresses: https://github.com/systemd/systemd/pull/9762#issuecomment-441187979
---

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 5cb049e5f73..64a30a5b9a8 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -3962,11 +3962,11 @@ static int run(int master,
         } else if (arg_slice || arg_property)
                 log_notice("Machine and scope registration turned off, --slice= and --property= settings will have no effect.");
 
-        r = sync_cgroup(*pid, arg_unified_cgroup_hierarchy, arg_uid_shift);
+        r = create_subcgroup(*pid, arg_keep_unit, arg_unified_cgroup_hierarchy);
         if (r < 0)
                 return r;
 
-        r = create_subcgroup(*pid, arg_keep_unit, arg_unified_cgroup_hierarchy);
+        r = sync_cgroup(*pid, arg_unified_cgroup_hierarchy, arg_uid_shift);
         if (r < 0)
                 return r;