diff options
| author | Lennart Poettering <lennart@poettering.net> | 2017-02-24 17:52:58 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2017-02-24 17:52:58 +0100 |
| commit | b4cccbc13ad6f98bd8e816ce5fffb99f5be74c8c (patch) | |
| tree | 14313f0bd5cd2dad79fda852663d9038f81a35ad /src/core/scope.c | |
| parent | fc9ae7178e1462377b272a14b1a763d480ab0980 (diff) | |
cgroup: change cg_unified() to possibly return errors again
We use our cgroup APIs in various contexts, including from our libraries
sd-login, sd-bus. As we don#t control those environments we can't rely
that the unified cgroup setup logic succeeds, and hence really shouldn't
assert on it.
This more or less reverts 415fc41ceaeada2e32639f24f134b1c248b9e43f.
Diffstat (limited to 'src/core/scope.c')
| -rw-r--r-- | src/core/scope.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/scope.c b/src/core/scope.c index 5e068a76d1..af93d577dd 100644 --- a/src/core/scope.c +++ b/src/core/scope.c @@ -475,7 +475,7 @@ static void scope_sigchld_event(Unit *u, pid_t pid, int code, int status) { /* If the PID set is empty now, then let's finish this off (On unified we use proper notifications) */ - if (!cg_unified(SYSTEMD_CGROUP_CONTROLLER) && set_isempty(u->pids)) + if (cg_unified(SYSTEMD_CGROUP_CONTROLLER) == 0 && set_isempty(u->pids)) scope_notify_cgroup_empty_event(u); } |