From 2dcb526d7a43cc4ac9493877ceb05810ff56dbae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 20 Feb 2017 12:26:53 -0500 Subject: [PATCH] cgroup-util: fix the reversed return value of cg_is_unified_systemd_contoller_wanted 1d84ad944520fc3e062ef518c4db4e1 reversed the meaning of the option. The kernel command line option has the opposite meaning to the function, i.e. specifying "legacy=yes" means "unifed systemd controller=no". --- src/basic/cgroup-util.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c index 67c2d3a681..b5ca10a2de 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c @@ -2378,7 +2378,9 @@ bool cg_is_unified_systemd_controller_wanted(void) { if (r < 0) return false; - return (wanted = r > 0 ? b : false); + /* The meaning of the kernel option is reversed wrt. to the return value + * of this function, hence the negation. */ + return (wanted = r > 0 ? !b : false); } bool cg_is_legacy_systemd_controller_wanted(void) {