From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 9 Nov 2015 23:36:57 +0000 (+0100)
Subject: cgls: suppress output of controller name, if it's the systemd one
X-Git-Tag: v228~64^2~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a6a4d3c46bd41e2f33e8eb61ac53b3c79049f167;p=thirdparty%2Fsystemd.git

cgls: suppress output of controller name, if it's the systemd one
---

diff --git a/src/cgls/cgls.c b/src/cgls/cgls.c
index 4e9a76a100d..a5a580438a2 100644
--- a/src/cgls/cgls.c
+++ b/src/cgls/cgls.c
@@ -165,8 +165,10 @@ static int get_cgroup_root(char **ret) {
 }
 
 static void show_cg_info(const char *controller, const char *path) {
-        if (cg_unified() <= 0)
+
+        if (cg_unified() <= 0 && controller && !streq(controller, SYSTEMD_CGROUP_CONTROLLER))
                 printf("Controller %s; ", controller);
+
         printf("Control group %s:\n", isempty(path) ? "/" : path);
         fflush(stdout);
 }