From: Franck Bui <fbui@suse.com>
Date: Wed, 23 Mar 2016 06:47:00 +0000 (+0100)
Subject: systemctl: no need to pass --all if inactive is explicitly requested in list-units
X-Git-Tag: v230~241^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2886%2Fhead;p=thirdparty%2Fsystemd.git

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.
---

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 180c8f9656c..2afb7bad1a5 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;