diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-02-24 18:48:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-24 18:48:57 -0500 |
| commit | 78e4f19ebc4c128ec72d732068df5b6f8a0e122d (patch) | |
| tree | 9c53c3f264abedd041184d107600a41acfce036b /src/core/unit.c | |
| parent | 13e785f7a0d2c78fbd822b1157ef9d7ee3fef805 (diff) | |
| parent | 4bb652ac2fe25d4c85072c9f2f610319ac9981ee (diff) | |
Merge pull request #5444 from poettering/cgroups-revert-no-error
Revert "core: simplify cg_[all_]unified()" and more.
Diffstat (limited to 'src/core/unit.c')
| -rw-r--r-- | src/core/unit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/unit.c b/src/core/unit.c index b784277a96..174dd42819 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -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; |