summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-08-25 20:37:54 +0200
committerLennart Poettering <lennart@poettering.net>2015-08-25 20:37:54 +0200
commit37a0d5bf212df5b45ded449f4adaefd737df058b (patch)
treea2dbb0ea2152628c6d3396ce94c5c2f09c67aadd
parent33c1c9745ccc478c8eda72f8bae76945487076ae (diff)
Revert "systemctl: properly handle empty control group paths in "status""
This reverts commit b04c25f9ef6359ed0ae403bdbfe4df840aba0f58.
-rw-r--r--src/systemctl/systemctl.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 587793fb17..3cb5f61868 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"))