From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 22 Nov 2018 11:02:13 +0000 (+0100)
Subject: cgroup: tweak log message, so that it doesn't claim we always enable controllers... 
X-Git-Tag: v240~225^2~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=94f344fb03101273471eeaa8c821a657255fd076;p=thirdparty%2Fsystemd.git

cgroup: tweak log message, so that it doesn't claim we always enable controllers when we actually disable them
---

diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index 0cd77e7f29c..2d303914893 100644
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -2641,7 +2641,8 @@ int cg_enable_everywhere(CGroupMask supported, CGroupMask mask, const char *p) {
 
                         r = write_string_stream(f, s, WRITE_STRING_FILE_DISABLE_BUFFER);
                         if (r < 0) {
-                                log_debug_errno(r, "Failed to enable controller %s for %s (%s): %m", n, p, fs);
+                                log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m",
+                                                FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs);
                                 clearerr(f);
                         }
                 }