From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 25 Aug 2015 18:37:54 +0000 (+0200)
Subject: Revert "systemctl: properly handle empty control group paths in "status""
X-Git-Tag: v225~21^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37a0d5bf212df5b45ded449f4adaefd737df058b;p=thirdparty%2Fsystemd.git

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

This reverts commit b04c25f9ef6359ed0ae403bdbfe4df840aba0f58.
---

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 587793fb170..3cb5f618687 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -3635,14 +3635,7 @@ static int status_property(const char *name, sd_bus_message *m, UnitStatusInfo *
                 if (r < 0)
                         return bus_log_parse_error(r);
 
-                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 (!isempty(s)) {
                         if (streq(name, "Id"))
                                 i->id = s;
                         else if (streq(name, "LoadState"))
@@ -3665,6 +3658,8 @@ 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"))