From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 24 Aug 2015 19:09:49 +0000 (+0200)
Subject: systemctl: properly handle empty control group paths in "status"
X-Git-Tag: v225~26^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b04c25f9ef6359ed0ae403bdbfe4df840aba0f58;p=thirdparty%2Fsystemd.git

systemctl: properly handle empty control group paths in "status"

When showing the status of the "-.slice" slice root unit (whose reported
cgroup path is ""), we suppressed the cgroup tree so far, because
skipped it for all unit with an empty cgroup path. Let's fix that, and
properly handle the empty cgroup path.
---

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 1a9dbadbe14..3cd267ec5a8 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -3608,7 +3608,14 @@ static int status_property(const char *name, sd_bus_message *m, UnitStatusInfo *
                 if (r < 0)
                         return bus_log_parse_error(r);
 
-                if (!isempty(s)) {
+                if (streq(name, "ControlGroup"))
+                        i->control_group = s;
+                else if (!isempty(s)) {
+                        /* For all but the cgroup path (see above) we
+                         * consider the empty string as unset. For the
+                         * cgroup path the empty string refers to the
+                         * root of the cgroup tree. */
+
                         if (streq(name, "Id"))
                                 i->id = s;
                         else if (streq(name, "LoadState"))
@@ -3631,8 +3638,6 @@ static int status_property(const char *name, sd_bus_message *m, UnitStatusInfo *
                                         i->control_group = e;
                         }
 #endif
-                        else if (streq(name, "ControlGroup"))
-                                i->control_group = s;
                         else if (streq(name, "StatusText"))
                                 i->status_text = s;
                         else if (streq(name, "PIDFile"))