From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 11 Jul 2013 17:15:01 +0000 (+0200)
Subject: systemctl: show cgroup tree if cgroup is empty but has non-empty children
X-Git-Tag: v206~134
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=042f9f5e5e76cf0e3cbfd009abd2add0366cdeca;p=elogind.git

systemctl: show cgroup tree if cgroup is empty but has non-empty children

This makes sure "systemctl status user.slice" shows a nice cgroup tree
of all logged in users.
---

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index d25b7d6fa..2ea5a3b0d 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -2788,7 +2788,7 @@ static void print_status_info(UnitStatusInfo *i) {
                 printf("   Status: \"%s\"\n", i->status_text);
 
         if (i->control_group &&
-            (i->main_pid > 0 || i->control_pid > 0 || cg_is_empty(SYSTEMD_CGROUP_CONTROLLER, i->control_group, false) == 0)) {
+            (i->main_pid > 0 || i->control_pid > 0 || cg_is_empty_recursive(SYSTEMD_CGROUP_CONTROLLER, i->control_group, false) == 0)) {
                 unsigned c;
 
                 printf("   CGroup: %s\n", i->control_group);