From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 20 Feb 2017 17:26:53 +0000 (-0500)
Subject: cgroup-util: fix the reversed return value of cg_is_unified_systemd_contoller_wanted
X-Git-Tag: v233~41^2~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2dcb526d7a43cc4ac9493877ceb05810ff56dbae;p=thirdparty%2Fsystemd.git

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".
---

diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index 67c2d3a681e..b5ca10a2de7 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) {