dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-07-25 08:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Lennart Poettering
2015-08-24 21:09:49 +02:00
parent a79366e22a
commit b04c25f9ef
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/systemctl/systemctl.c
View File

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