From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 24 Feb 2017 23:48:57 +0000 (-0500)
Subject: Merge pull request #5444 from poettering/cgroups-revert-no-error
X-Git-Tag: v233~39
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=78e4f19ebc4c128ec72d732068df5b6f8a0e122d;p=thirdparty%2Fsystemd.git

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

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

78e4f19ebc4c128ec72d732068df5b6f8a0e122d
diff --cc src/core/unit.c
index b784277a961,81a92b88416..174dd428197
--- a/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;