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

Revert "core: simplify cg_[all_]unified()" and more.
2017-02-24 18:48:57 -05:00
parent 13e785f7a0 4bb652ac2f
commit 78e4f19ebc
12 changed files with 207 additions and 91 deletions
@@ -3897,7 +3897,7 @@ int unit_kill_context(
                         * there we get proper events. Hence rely on
                         * 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;