picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
This reverts commit b04c25f9ef.
This commit is contained in:
Lennart Poettering 2015-08-25 20:37:54 +02:00
parent 33c1c9745c
commit 37a0d5bf21
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/systemctl/systemctl.c
View file

@ -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"))