Merge pull request #5444 from poettering/cgroups-revert-no-error

Revert "core: simplify cg_[all_]unified()" and more.

diff --cc src/core/unit.c
index b784277a961780c2b3ad1b87d924e32ede976896,81a92b88416e6957174e6a096f13184d44090274..174dd4281979f143519e902a043d9ffd7e1cc7d3
--- 1/src/core/unit.c
--- 2/src/core/unit.c
+++ b/src/core/unit.c
@@@ -3895,9 -3895,9 +3895,9 @@@ int unit_kill_context
                           * should not exist in non-delegated units. On
                           * the unified hierarchy that's different,
                           * there we get proper events. Hence rely on
 -                         * them.*/
 +                         * them. */
  
-                         if (cg_unified(SYSTEMD_CGROUP_CONTROLLER) ||
+                         if (cg_unified_controller(SYSTEMD_CGROUP_CONTROLLER) > 0 ||
                              (detect_container() == 0 && !unit_cgroup_delegate(u)))
                                  wait_for_exit = true;
  

diff --cc src/nspawn/nspawn-mount.c
Simple merge

diff --cc src/nspawn/nspawn.c
Simple merge