diff options
| author | Sven Eden <yamakuzure@gmx.net> | 2017-07-17 17:37:38 +0200 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2017-07-17 18:12:27 +0200 |
| commit | d2b09bed9c403544f4649d84007907e107d01508 (patch) | |
| tree | 4a24207bbd52c2087a7cef4c31869732225c517d /src/login/elogind.c | |
| parent | 57548a7257004bc1ccb16a4a4aee76a91b5a23fe (diff) | |
Prep v233: Add missing updates from upstream in src/login
Diffstat (limited to 'src/login/elogind.c')
| -rw-r--r-- | src/login/elogind.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/login/elogind.c b/src/login/elogind.c index 5da9ae6a2..57d6fe433 100644 --- a/src/login/elogind.c +++ b/src/login/elogind.c @@ -145,7 +145,10 @@ int elogind_setup_cgroups_agent(Manager *m) { if (!MANAGER_IS_SYSTEM(m)) return 0; - if (cg_unified(SYSTEMD_CGROUP_CONTROLLER) > 0) /* We don't need this anymore on the unified hierarchy */ + r = cg_unified_controller(SYSTEMD_CGROUP_CONTROLLER); + if (r < 0) + return log_error_errno(r, "Failed to determine whether unified cgroups hierarchy is used: %m"); + if (r > 0) /* We don't need this anymore on the unified hierarchy */ return 0; if (m->cgroups_agent_fd < 0) { |