take jointly mounted controllers into account when migrate cgroups, otherwise "CGroup...

diff --git a/src/shared/cgroup-setup.c b/src/shared/cgroup-setup.c
index c3bf7348ffe9caa531a5e69180dffc48e28a48d1..2ea83f05d317e09cfb1a6b7797bcdb010e952eea 100644 (file)
--- a/src/shared/cgroup-setup.c
+++ b/src/shared/cgroup-setup.c
@@ -768,6 +768,8 @@ int cg_migrate_v1_controllers(CGroupMask supported, CGroupMask mask, const char
                 /* Remember first error and try continuing */
                 q = cg_migrate_recursive_fallback(SYSTEMD_CGROUP_CONTROLLER, from, cgroup_controller_to_string(c), to, 0);
                 r = (r < 0) ? r : q;
+
+                done |= CGROUP_MASK_EXTEND_JOINED(bit);
         }
 
         return r;