From ebc962656cee33e3e8395f456a8208c3ca41969c Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Wed, 23 Mar 2016 07:47:00 +0100 Subject: systemctl: no need to pass --all if inactive is explicitly requested in list-units If list-units command is explicitly asked to show inactive units by using '--state=inactive' option, there's no need to force the user to pass '--all' option to include inactive units in the search in this case. --- src/systemctl/systemctl.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index 180c8f9656..2afb7bad1a 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -340,6 +340,11 @@ static bool output_show_unit(const UnitInfo *u, char **patterns) { if (arg_all) return true; + if (!strv_isempty(arg_states)) + return true; + + /* By default show all units except the ones in inactive + * state and with no pending job */ if (u->job_id > 0) return true; -- cgit v1.2.1