From b4cccbc13ad6f98bd8e816ce5fffb99f5be74c8c Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 24 Feb 2017 17:52:58 +0100 Subject: 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. --- src/cgls/cgls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/cgls/cgls.c') diff --git a/src/cgls/cgls.c b/src/cgls/cgls.c index 40db82f9ae..1b746a0e13 100644 --- a/src/cgls/cgls.c +++ b/src/cgls/cgls.c @@ -158,7 +158,7 @@ static int parse_argv(int argc, char *argv[]) { static void show_cg_info(const char *controller, const char *path) { - if (!cg_all_unified() && controller && !streq(controller, SYSTEMD_CGROUP_CONTROLLER)) + if (cg_all_unified() == 0 && controller && !streq(controller, SYSTEMD_CGROUP_CONTROLLER)) printf("Controller %s; ", controller); printf("Control group %s:\n", isempty(path) ? "/" : path); -- cgit v1.2.3-54-g00ecf