From: Harald Hoyer <harald@redhat.com>
Date: Wed, 10 Apr 2013 10:32:27 +0000 (+0200)
Subject: systemctl: clarify usage of "--all" versus list-unit-files
X-Git-Tag: v202~46
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=87698625aaf08ab2411a54a4ac9878acd4b46772;p=elogind.git

systemctl: clarify usage of "--all" versus list-unit-files

Novice users might think, that
 $ systemctl --all
is equal to
 $ systemctl list-unit-files

https://bugzilla.redhat.com/show_bug.cgi?id=748512
---

diff --git a/man/systemctl.xml b/man/systemctl.xml
index a2c3501ec..c0f5bb974 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -133,10 +133,12 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
         <term><option>--all</option></term>
 
         <listitem>
-          <para>When listing units, show all units, regardless of
+          <para>When listing units, show all internally loaded units, regardless of
           their state, including inactive units. When showing
           unit/job/manager properties, show all properties regardless
           whether they are set or not.</para>
+          <para>To list all units installed on disk, use the command
+          <command>list-unit-files</command> instead.</para>
         </listitem>
       </varlistentry>
 
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 2f43052f9..b738a6d1d 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -4488,7 +4488,9 @@ static int systemctl_help(void) {
                "     --version        Show package version\n"
                "  -t --type=TYPE      List only units of a particular type\n"
                "  -p --property=NAME  Show only properties by this name\n"
-               "  -a --all            Show all units/properties, including dead/empty ones\n"
+               "  -a --all            Show all internally loaded units/properties,\n"
+               "                      including dead/empty ones. To list all units installed\n"
+               "                      on disk, use the command 'list-unit-files' instead.\n"
                "     --failed         Show only failed units\n"
                "     --full           Don't ellipsize unit names on output\n"
                "     --fail           When queueing a new job, fail if conflicting jobs are\n"