diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-08-19 19:00:25 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-08-19 19:58:01 -0400 |
| commit | 2056ec192742d45aa72a851dbd22ad1fe0bc91a2 (patch) | |
| tree | 5f134b9c2d466b1726771df416f812d49ad1e60d /src/core/unit.c | |
| parent | e6c9fa74a5b1dc1c29797cab43a078b512438885 (diff) | |
| parent | 5da38d0768bf53f611ccdd47d7d941e1c560e44e (diff) | |
Merge pull request #3965 from htejun/systemd-controller-on-unified
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 4b8d81c3f1..c58c501bc3 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -3726,7 +3726,7 @@ int unit_kill_context( * there we get proper events. Hence rely on * them.*/ - if (cg_unified() > 0 || + if (cg_unified(SYSTEMD_CGROUP_CONTROLLER) > 0 || (detect_container() == 0 && !unit_cgroup_delegate(u))) wait_for_exit = true; |