summaryrefslogtreecommitdiff
path: root/src/cgls/cgls.c
diff options
context:
space:
mode:
authorDaniel Mack <github@zonque.org>2015-11-10 21:01:35 +0100
committerDaniel Mack <github@zonque.org>2015-11-10 21:01:35 +0100
commite3c4a681db0b7004904b95d55fd1a443161c9397 (patch)
treea5b08abba6a533a3c4fc2a8f1bb9097957580c46 /src/cgls/cgls.c
parent092b6e188b6b75be4450c6f20fc82599dcaf9552 (diff)
parentde7399eb7427da46c5cd355181080274f69567a2 (diff)
Merge pull request #1835 from poettering/grabbag-of-stuff
Lots of small fixes
Diffstat (limited to 'src/cgls/cgls.c')
-rw-r--r--src/cgls/cgls.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/cgls/cgls.c b/src/cgls/cgls.c
index 4e9a76a100..22efc58ac9 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);
}
@@ -270,6 +272,7 @@ int main(int argc, char *argv[]) {
show_cg_info(SYSTEMD_CGROUP_CONTROLLER, root);
+ printf("-.slice\n");
r = show_cgroup(SYSTEMD_CGROUP_CONTROLLER, root, NULL, 0, arg_kernel_threads, output_flags);
}
}