mirror of
https://github.com/systemd/systemd.git
synced 2025-02-04 21:47:31 +03:00
systemctl: fix counting in list-units output
https://bugzilla.redhat.com/show_bug.cgi?id=643502
This commit is contained in:
parent
b772cfe0cc
commit
688c672501
@ -265,7 +265,7 @@ static bool output_show_job(const struct unit_info *u) {
|
||||
}
|
||||
|
||||
static void output_units_list(const struct unit_info *unit_infos, unsigned c) {
|
||||
unsigned active_len, sub_len, job_len;
|
||||
unsigned active_len, sub_len, job_len, n_shown = 0;
|
||||
const struct unit_info *u;
|
||||
|
||||
active_len = sizeof("ACTIVE")-1;
|
||||
@ -300,6 +300,8 @@ static void output_units_list(const struct unit_info *unit_infos, unsigned c) {
|
||||
if (!output_show_job(u))
|
||||
continue;
|
||||
|
||||
n_shown++;
|
||||
|
||||
if (!streq(u->load_state, "loaded") &&
|
||||
!streq(u->load_state, "banned")) {
|
||||
on_loaded = ansi_highlight(true);
|
||||
@ -352,9 +354,9 @@ static void output_units_list(const struct unit_info *unit_infos, unsigned c) {
|
||||
"JOB = Pending job for the unit.\n");
|
||||
|
||||
if (arg_all)
|
||||
printf("\n%u units listed.\n", c);
|
||||
printf("\n%u units listed.\n", n_shown);
|
||||
else
|
||||
printf("\n%u units listed. Pass --all to see inactive units, too.\n", c);
|
||||
printf("\n%u units listed. Pass --all to see inactive units, too.\n", n_shown);
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user