X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fsystemctl%2Fsystemctl.c;h=d57e0931a5ff7bff92c641626f00061bb07c5808;hb=e677bf7ef610acdc5068b9d5d4c79556a236e52f;hp=e8b8b51d7634a40ce9c1723a218bfdbb5b521665;hpb=c3175a7f40a2d2fabc3a2de63033a6810d45221a;p=elogind.git diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index e8b8b51d7..d57e0931a 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -2378,12 +2378,22 @@ static void print_status_info(UnitStatusInfo *i) { printf("\t CGroup: %s\n", i->default_control_group); if (arg_transport != TRANSPORT_SSH) { - if ((c = columns()) > 18) + unsigned k = 0; + pid_t extra[2]; + + c = columns(); + if (c > 18) c -= 18; else c = 0; - show_cgroup_by_path(i->default_control_group, "\t\t ", c, false, arg_all); + if (i->main_pid > 0) + extra[k++] = i->main_pid; + + if (i->control_pid > 0) + extra[k++] = i->control_pid; + + show_cgroup_and_extra_by_spec(i->default_control_group, "\t\t ", c, false, arg_all, extra, k); } }