From 9ea9d4cf1656075559fcd6aeceb9530714c87d5b Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 26 Jul 2013 16:34:52 +0200
Subject: systemctl: move "dump" command from systemctl to systemd-analyze

It's an analysis command and its format is explicitly not covered by any
stability guarantees, hence move away from systemctl and into
systemd-analyze, minimizing the already large interface of systemctl a
bit.

This patch also adds auto-paging to the various systemd-analyze commands
where that makes sense
---
 man/systemctl.xml       |  9 ---------
 man/systemd-analyze.xml | 39 ++++++++++++++++++++++++++++++++++++++-
 2 files changed, 38 insertions(+), 10 deletions(-)

(limited to 'man')

diff --git a/man/systemctl.xml b/man/systemctl.xml
index ee13a70fef..06c8c18465 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -993,16 +993,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
           all pending jobs.</para>
         </listitem>
       </varlistentry>
-      <varlistentry>
-        <term><command>dump</command></term>
 
-        <listitem>
-          <para>Dump server status. This will output a (usually very
-          long) human readable manager status dump. Its format is
-          subject to change without notice and should not be parsed by
-          applications.</para>
-        </listitem>
-      </varlistentry>
       <varlistentry>
         <term><command>list-dependencies <replaceable>NAME</replaceable></command></term>
 
diff --git a/man/systemd-analyze.xml b/man/systemd-analyze.xml
index f5a9424248..905b44b6d9 100644
--- a/man/systemd-analyze.xml
+++ b/man/systemd-analyze.xml
@@ -82,6 +82,11 @@
                         <arg choice="plain">dot</arg>
                         <arg choice="opt" rep="repeat"><replaceable>PATTERN</replaceable></arg>
                 </cmdsynopsis>
+                <cmdsynopsis>
+                        <command>systemd-analyze</command>
+                        <arg choice="opt" rep="repeat">OPTIONS</arg>
+                        <arg choice="plain">dump</arg>
+                </cmdsynopsis>
         </refsynopsisdiv>
 
         <refsect1>
@@ -127,7 +132,7 @@
                 been started at what time, highlighting the time they
                 spent on initialization.</para>
 
-                <para><command>systemd-analyze dot</command> Generate
+                <para><command>systemd-analyze dot</command> generates
                 textual dependency graph description in dot format for
                 further processing with the GraphViz
                 <citerefentry><refentrytitle>dot</refentrytitle><manvolnum>1</manvolnum></citerefentry>
@@ -143,6 +148,12 @@
                 any of these patterns match either the origin or
                 destination node.</para>
 
+                <para><command>systemd-analyze dump</command> outputs
+                a (usually very long) human-readable serialization of
+                the complete server state. Its format is subject to
+                change without notice and should not be parsed by
+                applications.</para>
+
                 <para>If no command is passed, <command>systemd-analyze
                 time</command> is implied.</para>
 
@@ -228,6 +239,14 @@
                                 unless specified with a different unit,
                                 e.g. "50ms".</para></listitem>
                         </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--no-pager</option></term>
+
+                                <listitem>
+                                        <para>Do not pipe output into a pager.</para>
+                                </listitem>
+                        </varlistentry>
                 </variablelist>
 
         </refsect1>
@@ -256,6 +275,24 @@ $ eog targets.svg</programlisting>
 
         </refsect1>
 
+        <refsect1>
+                <title>Environment</title>
+
+                <variablelist class='environment-variables'>
+                        <varlistentry>
+                                <term><varname>$SYSTEMD_PAGER</varname></term>
+
+                                <listitem>
+                                        <para>Pager to use when <option>--no-pager</option> is not
+                                        given; overrides <varname>$PAGER</varname>.  Setting this to
+                                        an empty string or the value <literal>cat</literal> is
+                                        equivalent to passing
+                                        <option>--no-pager</option>.</para>
+                                </listitem>
+                        </varlistentry>
+                </variablelist>
+        </refsect1>
+
         <refsect1>
                 <title>See Also</title>
                 <para>
-- 
cgit v1.2.3-54-g00ecf