[systemd-commits] 7 commits - man/systemctl.xml man/systemd-bootchart.xml README src/bootchart src/systemctl

Zbigniew Jędrzejewski-Szmek zbyszek at kemper.freedesktop.org
Sat Feb 16 14:37:12 PST 2013


 README                    |    7 
 man/systemctl.xml         | 2410 +++++++++++++++++++++-------------------------
 man/systemd-bootchart.xml |  164 +--
 src/bootchart/README      |   83 -
 src/bootchart/bootchart.c |   85 +
 src/systemctl/systemctl.c |  152 ++
 6 files changed, 1433 insertions(+), 1468 deletions(-)

New commits:
commit 033a842c36e7629f81d05d12a4ed8c298ad4d3f2
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Sat Feb 16 17:20:28 2013 -0500

    systemctl: allow comma sepearted property lists

diff --git a/man/systemctl.xml b/man/systemctl.xml
index 1a55522..683f2e7 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -120,10 +120,9 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
           <para>When showing unit/job/manager properties, limit
           display to certain properties as specified as argument. If
           not specified all set properties are shown. The argument
-          should be a property name, such as
+          should be a comma-seperated list of property names, such as
           <literal>MainPID</literal>. If specified more than once all
-          properties with the specified names are
-          shown.</para>
+          properties with the specified names are shown.</para>
         </listitem>
       </varlistentry>
 
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index ddf46b6..509651c 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -4394,18 +4394,33 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
                         log_info("Use -t help to see a list of allowed values.");
                         return -EINVAL;
                 case 'p': {
-                        char **l;
+                        char *word, *state;
+                        size_t size;
+                        /* Make sure that if the empty property list
+                           was specified, we won't show any properties. */
+                        const char *source = isempty(optarg) ? " " : optarg;
+
+                        FOREACH_WORD_SEPARATOR(word, size, source, ",", state) {
+                                char _cleanup_free_ *prop;
+                                char **tmp;
+
+                                prop = strndup(word, size);
+                                if (!prop)
+                                        return -ENOMEM;
 
-                        if (!(l = strv_append(arg_property, optarg)))
-                                return -ENOMEM;
+                                tmp = strv_append(arg_property, prop);
+                                if (!tmp)
+                                        return -ENOMEM;
 
-                        strv_free(arg_property);
-                        arg_property = l;
+                                strv_free(arg_property);
+                                arg_property = tmp;
+                        }
 
                         /* If the user asked for a particular
                          * property, show it to him, even if it is
                          * empty. */
                         arg_all = true;
+
                         break;
                 }
 

commit 4a6022f01cfe092d018db52186d6af1fe28f3421
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Sat Feb 16 16:28:21 2013 -0500

    man: prettify systemctl(1)
    
    - reindent with two spaces, otherwise everything is squeezed near
      the right margin,
    - mark only optional arguments as optional,
    - some typos, etc.

diff --git a/man/systemctl.xml b/man/systemctl.xml
index 760115a..1a55522 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -1,1289 +1,1157 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
-  This file is part of systemd.
+This file is part of systemd.
 
-  Copyright 2010 Lennart Poettering
+Copyright 2010 Lennart Poettering
 
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
+systemd is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
 
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
+systemd is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
 
-  You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+You should have received a copy of the GNU Lesser General Public License
+along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
 <refentry id="systemctl">
 
-        <refentryinfo>
-                <title>systemctl</title>
-                <productname>systemd</productname>
-
-                <authorgroup>
-                        <author>
-                                <contrib>Developer</contrib>
-                                <firstname>Lennart</firstname>
-                                <surname>Poettering</surname>
-                                <email>lennart at poettering.net</email>
-                        </author>
-                </authorgroup>
-        </refentryinfo>
-
-        <refmeta>
-                <refentrytitle>systemctl</refentrytitle>
-                <manvolnum>1</manvolnum>
-        </refmeta>
-
-        <refnamediv>
-                <refname>systemctl</refname>
-                <refpurpose>Control the systemd system and service manager</refpurpose>
-        </refnamediv>
-
-        <refsynopsisdiv>
-                <cmdsynopsis>
-                        <command>systemctl <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="req">COMMAND</arg> <arg choice="opt" rep="repeat">NAME</arg></command>
-                </cmdsynopsis>
-        </refsynopsisdiv>
-
-        <refsect1>
-                <title>Description</title>
-
-                <para><command>systemctl</command> may be used to
-                introspect and control the state of the
-                <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-                system and service manager.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>Options</title>
-
-                <para>The following options are understood:</para>
-
-                <variablelist>
-                        <varlistentry>
-                                <term><option>-h</option></term>
-                                <term><option>--help</option></term>
-
-                                <listitem><para>Prints a short help
-                                text and exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--version</option></term>
-
-                                <listitem><para>Prints a short version
-                                string and exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-t</option></term>
-                                <term><option>--type=</option></term>
-
-                                <listitem><para>The argument should
-                                be a unit type name such as
-                                <option>service</option> and
-                                <option>socket</option>,
-                                or a unit load state such as
-                                <option>loaded</option> and
-                                <option>masked</option>.
-                                </para>
-
-                                <para>If the argument is a unit type,
-                                when listing units, limit display to
-                                certain unit types. If not specified
-                                units of all types will be shown.</para>
-
-                                <para>If the argument is a unit load state,
-                                when listing units, limit display to
-                                certain unit types. If not specified
-                                units of in all load states will be
-                                shown.</para>
-
-                                <para>As a special case, if the argument
-                                is <option>help</option>, a list of
-                                allowed values will be printed and the
-                                program will exit.</para>
-                                </listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-p</option></term>
-                                <term><option>--property=</option></term>
-
-                                <listitem><para>When showing
-                                unit/job/manager properties, limit
-                                display to certain properties as
-                                specified as argument. If not
-                                specified all set properties are
-                                shown. The argument should be a
-                                property name, such as
-                                <literal>MainPID</literal>. If
-                                specified more than once all
-                                properties with the specified names
-                                are shown.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-a</option></term>
-                                <term><option>--all</option></term>
-
-                                <listitem><para>When listing units,
-                                show all 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></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--failed</option></term>
-
-                                <listitem><para>When listing units,
-                                show only failed units. Do not confuse
-                                with
-                                <option>--fail</option>.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--full</option></term>
-
-                                <listitem><para>Do not ellipsize unit
-                                names, cgroup members, and truncate unit descriptions
-                                in the output of
-                                <command>list-units</command> and
-                                <command>list-jobs</command>.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--fail</option></term>
-
-                                <listitem><para>If the requested
-                                operation conflicts with a pending
-                                unfinished job, fail the command. If
-                                this is not specified the requested
-                                operation will replace the pending job,
-                                if necessary. Do not confuse
-                                with
-                                <option>--failed</option>.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--ignore-dependencies</option></term>
-
-                                <listitem><para>When enqueuing a new
-                                job ignore all its dependencies and
-                                execute it immediately. If passed no
-                                required units of the unit passed will
-                                be pulled in, and no ordering
-                                dependencies will be honored. This is
-                                mostly a debugging and rescue tool for
-                                the administrator and should not be
-                                used by
-                                applications.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-i</option></term>
-                                <term><option>--ignore-inhibitors</option></term>
-
-                                <listitem><para>When system shutdown
-                                or a sleep state is requested, ignore
-                                inhibitor locks. Applications can
-                                establish inhibitor locks to avoid
-                                that certain important operations
-                                (such as CD burning or suchlike) are
-                                interrupted by system shutdown or a
-                                sleep state. Any user may take these
-                                locks and privileged users may
-                                override these locks. If any locks are
-                                taken, shutdown and sleep state
-                                requests will normally fail
-                                (regardless if privileged or not) and
-                                list of active locks is
-                                printed. However if
-                                <option>--ignore-inhibitors</option>
-                                is specified the locks are ignored and
-                                not printed, and the operation
-                                attempted anyway, possibly requiring
-                                additional
-                                privileges.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-q</option></term>
-                                <term><option>--quiet</option></term>
-
-                                <listitem><para>Suppress output to
-                                STDOUT in
-                                <command>snapshot</command>,
-                                <command>is-active</command>,
-                                <command>is-failed</command>,
-                                <command>enable</command> and
-                                <command>disable</command>.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--no-block</option></term>
-
-                                <listitem><para>Do not synchronously wait for
-                                the requested operation to finish. If this is
-                                not specified the job will be verified,
-                                enqueued and <command>systemctl</command> will
-                                wait until it is completed. By passing this
-                                argument it is only verified and
-                                enqueued.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--no-legend</option></term>
-
-                                <listitem><para>Do not print a legend, i.e.
-                                the column headers and the footer with hints.
-                                </para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--no-pager</option></term>
-
-                                <listitem><para>Do not pipe output into a
-                                pager.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--system</option></term>
-
-                                <listitem><para>Talk to the systemd
-                                system manager. (Default)</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--user</option></term>
-
-                                <listitem><para>Talk to the systemd
-                                manager of the calling user.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--no-wall</option></term>
-
-                                <listitem><para>Don't send wall
-                                message before
-                                halt, power-off, reboot.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--global</option></term>
-
-                                <listitem><para>When used with
-                                <command>enable</command> and
-                                <command>disable</command>, operate on the
-                                global user configuration
-                                directory, thus enabling or disabling
-                                a unit file globally for all future
-                                logins of all users.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--no-reload</option></term>
-
-                                <listitem><para>When used with
-                                <command>enable</command> and
-                                <command>disable</command>, do not
-                                implicitly reload daemon configuration
-                                after executing the
-                                changes.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--no-ask-password</option></term>
-
-                                <listitem><para>When used with
-                                <command>start</command> and related
-                                commands, disables asking for
-                                passwords. Background services may
-                                require input of a password or
-                                passphrase string, for example to
-                                unlock system hard disks or
-                                cryptographic certificates. Unless
-                                this option is specified and the
-                                command is invoked from a terminal
-                                <command>systemctl</command> will
-                                query the user on the terminal for the
-                                necessary secrets. Use this option to
-                                switch this behavior off. In this case
-                                the password must be supplied by some
-                                other means (for example graphical
-                                password agents) or the service might
-                                fail. This also disables querying the
-                                user for authentication for privileged
-                                operations.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--kill-who=</option></term>
-
-                                <listitem><para>When used with
-                                <command>kill</command>, choose which
-                                processes to kill. Must be one of
-                                <option>main</option>,
-                                <option>control</option> or
-                                <option>all</option> to select whether
-                                to kill only the main process of the
-                                unit, the control process or all
-                                processes of the unit. If omitted
-                                defaults to
-                                <option>all</option>.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-s</option></term>
-                                <term><option>--signal=</option></term>
-
-                                <listitem><para>When used with
-                                <command>kill</command>, choose which
-                                signal to send to selected
-                                processes. Must be one of the well
-                                known signal specifiers such as
-                                SIGTERM, SIGINT or SIGSTOP. If
-                                omitted defaults to
-                                <option>SIGTERM</option>.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-f</option></term>
-                                <term><option>--force</option></term>
-
-                                <listitem><para>When used with
-                                <command>enable</command>, overwrite any
-                                existing conflicting
-                                symlinks.</para></listitem>
-
-                                <listitem><para>When used with
-                                <command>halt</command>,
-                                <command>poweroff</command>,
-                                <command>reboot</command> or
-                                <command>kexec</command> execute the
-                                selected operation without shutting
-                                down all units. However, all processes
-                                will be killed forcibly and all file
-                                systems are unmounted or remounted
-                                read-only. This is hence a drastic but
-                                relatively safe option to request an
-                                immediate reboot. If
-                                <option>--force</option> is specified
-                                twice for these operations, they will
-                                be executed immediately without
-                                terminating any processes or umounting
-                                any file systems. Warning: specifying
-                                <option>--force</option> twice with
-                                any of these operations might result
-                                in data loss.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--root=</option></term>
-
-                                <listitem><para>When used with
-                                <command>enable</command>/<command>disable</command>/<command>is-enabled</command> (and
-                                related commands), use alternative
-                                root path when looking for unit
-                                files.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--runtime</option></term>
-
-                                <listitem><para>When used with
-                                <command>enable</command>/<command>disable</command>/<command>is-enabled</command> (and related commands), make
-                                changes only temporarily, so that they
-                                are dropped on the next reboot. This
-                                will have the effect that changes are
-                                not made in subdirectories of
-                                <filename>/etc</filename> but in
-                                <filename>/run</filename>, with
-                                identical immediate effects, however,
-                                since the latter is lost on reboot,
-                                the changes are lost
-                                too.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-H</option></term>
-                                <term><option>--host</option></term>
-
-                                <listitem><para>Execute operation
-                                remotely. Specify a hostname, or
-                                username and hostname separated by @,
-                                to connect to. This will use SSH to
-                                talk to the remote systemd
-                                instance.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-P</option></term>
-                                <term><option>--privileged</option></term>
-
-                                <listitem><para>Acquire privileges via
-                                PolicyKit before executing the
-                                operation.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-n</option></term>
-                                <term><option>--lines=</option></term>
-
-                                <listitem><para>When used with
-                                <command>status</command> controls the
-                                number of journal lines to show,
-                                counting from the most recent
-                                ones. Takes a positive integer
-                                argument. Defaults to
-                                10.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-o</option></term>
-                                <term><option>--output=</option></term>
-
-                                <listitem><para>When used with
-                                <command>status</command> controls the
-                                formatting of the journal entries that
-                                are shown. For the available choices
-                                see
-                                <citerefentry><refentrytitle>journalctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>. Defaults
-                                to
-                                <literal>short</literal>.</para></listitem>
-                        </varlistentry>
-
-                </variablelist>
-
-                <para>The following commands are understood:</para>
-
-                <variablelist>
-                        <varlistentry>
-                                <term><command>list-units</command></term>
-
-                                <listitem><para>List known units (subject to limitations
-                                specified with <option>-t</option>).</para>
-
-                                <para>This is the default command.</para></listitem>
-                        </varlistentry>
-                        <varlistentry>
-                                <term><command>start [NAME...]</command></term>
-
-                                <listitem><para>Start (activate) one
-                                or more units specified on the command
-                                line.</para></listitem>
-                        </varlistentry>
-                        <varlistentry>
-                                <term><command>stop [NAME...]</command></term>
-
-                                <listitem><para>Stop (deactivate) one
-                                or more units specified on the command
-                                line.</para></listitem>
-                        </varlistentry>
-                        <varlistentry>
-                                <term><command>reload [NAME...]</command></term>
-
-                                <listitem><para>Asks all units listed
-                                on the command line to reload their
-                                configuration. Note that this will
-                                reload the service-specific
-                                configuration, not the unit
-                                configuration file of systemd. If you
-                                want systemd to reload the
-                                configuration file of a unit use the
-                                <command>daemon-reload</command>
-                                command. In other words: for the
-                                example case of Apache, this will
-                                reload Apache's
-                                <filename>httpd.conf</filename> in the
-                                web server, not the
-                                <filename>apache.service</filename>
-                                systemd unit file. </para>
-
-                                <para>This command should not be
-                                confused with the
-                                <command>daemon-reload</command> or
-                                <command>load</command>
-                                commands.</para></listitem>
-
-                        </varlistentry>
-                        <varlistentry>
-                                <term><command>restart [NAME...]</command></term>
-
-                                <listitem><para>Restart one or more
-                                units specified on the command
-                                line. If the units are not running yet
-                                they will be
-                                started.</para></listitem>
-                        </varlistentry>
-                        <varlistentry>
-                                <term><command>try-restart [NAME...]</command></term>
-
-                                <listitem><para>Restart one or more
-                                units specified on the command
-                                line if the units are running. Do
-                                nothing if units are not running.
-                                Note that for compatibility
-                                with Red Hat init scripts
-                                <command>condrestart</command> is
-                                equivalent to this command.</para></listitem>
-                        </varlistentry>
-                        <varlistentry>
-                                <term><command>reload-or-restart [NAME...]</command></term>
-
-                                <listitem><para>Reload one or more
-                                units if they support it. If not,
-                                restart them instead. If the units
-                                are not running yet they will be
-                                started.</para></listitem>
-                        </varlistentry>
-                        <varlistentry>
-                                <term><command>reload-or-try-restart [NAME...]</command></term>
-
-                                <listitem><para>Reload one or more
-                                units if they support it. If not,
-                                restart them instead. Do nothing if
-                                the units are not running. Note that
-                                for compatibility with SysV init
-                                scripts
-                                <command>force-reload</command> is
-                                equivalent to this
-                                command.</para></listitem>
-                        </varlistentry>
-                        <varlistentry>
-                                <term><command>isolate [NAME]</command></term>
-
-                                <listitem><para>Start the unit
-                                specified on the command line and its
-                                dependencies and stop all others.</para>
-
-                                <para>This is similar to changing the
-                                runlevel in a traditional init system. The
-                                <command>isolate</command> command will
-                                immediately stop processes that are not
-                                enabled in the new unit, possibly including
-                                the graphical environment or terminal you
-                                are currently using.</para>
-
-                                <para>Note that this works only on units
-                                where <option>AllowIsolate=</option> is
-                                enabled. See
-                                <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-                                for details.</para></listitem>
-                        </varlistentry>
-                        <varlistentry>
-                                <term><command>kill [NAME...]</command></term>
-
-                                <listitem><para>Send a signal to one
-                                or more processes of the unit. Use
-                                <option>--kill-who=</option> to select
-                                which process to kill. Use
-                                <option>--kill-mode=</option> to
-                                select the kill mode and
-                                <option>--signal=</option> to select
-                                the signal to send.</para></listitem>
-                        </varlistentry>
-                        <varlistentry>
-                                <term><command>is-active [NAME...]</command></term>
-
-                                <listitem><para>Check whether any of
-                                the specified units are active
-                                (i.e. running). Returns an exit code
-                                0 if at least one is active, non-zero
-                                otherwise. Unless
-                                <option>--quiet</option> is specified
-                                this will also print the current unit
-                                state to STDOUT.</para></listitem>
-                        </varlistentry>
-                        <varlistentry>
-                                <term><command>is-failed [NAME...]</command></term>
-
-                                <listitem><para>Check whether any of
-                                the specified units are failed.
-                                Returns an exit code
-                                0 if at least one is failed, non-zero
-                                otherwise. Unless
-                                <option>--quiet</option> is specified
-                                this will also print the current unit
-                                state to STDOUT.</para></listitem>
-                        </varlistentry>
-                        <varlistentry>
-                                <term><command>status [NAME...|PID...]</command></term>
-
-                                <listitem><para>Show terse runtime
-                                status information about one or more
-                                units, followed by most recent log
-                                data from the journal. If no units are
-                                specified, show all units (subject to
-                                limitations specified with
-                                <option>-t</option>). If a PID is
-                                passed show information about the unit
-                                the process belongs to.</para>
-
-                                <para>This function is intended to
-                                generate human-readable output. If you
-                                are looking for computer-parsable
-                                output, use <command>show</command>
-                                instead.</para></listitem>
-                        </varlistentry>
-                        <varlistentry>
-                                <term><command>show [NAME...|JOB...]</command></term>
-
-                                <listitem><para>Show properties of one
-                                or more units, jobs or the manager
-                                itself. If no argument is specified
-                                properties of the manager will be
-                                shown. If a unit name is specified
-                                properties of the unit is shown, and
-                                if a job id is specified properties of
-                                the job is shown. By default, empty
-                                properties are suppressed. Use
-                                <option>--all</option> to show those
-                                too. To select specific properties to
-                                show use
-                                <option>--property=</option>. This
-                                command is intended to be used
-                                whenever computer-parsable output is
-                                required. Use
-                                <command>status</command> if you are
-                                looking for formatted human-readable
-                                output.</para></listitem>
-                        </varlistentry>
-                        <varlistentry>
-                                <term><command>help [NAME...|PID...]</command></term>
-
-                                <listitem><para>Show manual pages for
-                                one or more units, if available. If a
-                                PID is passed the manual pages for the
-                                unit the process of the PID belongs to
-                                is shown.</para></listitem>
-                        </varlistentry>
-                        <varlistentry>
-                                <term><command>reset-failed [NAME...]</command></term>
-
-                                <listitem><para>Reset the
-                                '<literal>failed</literal>' state of the
-                                specified units, or if no unit name is
-                                passed of all units. When a unit fails
-                                in some way (i.e. process exiting with
-                                non-zero error code, terminating
-                                abnormally or timing out) it will
-                                automatically enter the
-                                '<literal>failed</literal>' state and
-                                its exit code and status is recorded
-                                for introspection by the administrator
-                                until the service is restarted or
-                                reset with this
-                                command.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><command>list-unit-files</command></term>
-
-                                <listitem><para>List installed unit files.
-                                </para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><command>enable [NAME...]</command></term>
-
-                                <listitem><para>Enable one or
-                                more unit files or unit file
-                                instances, as specified on the
-                                command line. This will create a
-                                number of symlinks as encoded in
-                                the <literal>[Install]</literal>
-                                sections of the unit files. After
-                                the symlinks have been created the
-                                systemd configuration is reloaded
-                                (in a way that is equivalent to
-                                <command>daemon-reload</command>)
-                                to ensure the changes are taken into
-                                account immediately. Note that this
-                                does not have the effect that any of
-                                the units enabled are also started at
-                                the same time.  If this is desired
-                                a separate <command>start</command>
-                                command must be invoked for the unit.
-                                Also note that in case of instance
-                                enablement, symlinks named same as
-                                instances are created in install
-                                location, however they all point to
-                                the same template unit file.</para>
-
-                                <para>This command will
-                                print the actions executed. This
-                                output may be suppressed by passing
-                                <option>--quiet</option>.</para>
-
-                                <para>Note that this operation creates
-                                only the suggested symlinks for the
-                                units. While this command is the
-                                recommended way to manipulate the unit
-                                configuration directory, the
-                                administrator is free to make
-                                additional changes manually, by
-                                placing or removing symlinks in the
-                                directory. This is particularly useful
-                                to create configurations that deviate
-                                from the suggested default
-                                installation. In this case the
-                                administrator must make sure to invoke
-                                <command>daemon-reload</command>
-                                manually as necessary, to ensure his
-                                changes are taken into account.</para>
-
-                                <para>Enabling units should not be
-                                confused with starting (activating)
-                                units, as done by the
-                                <command>start</command>
-                                command. Enabling and starting units
-                                is orthogonal: units may be enabled
-                                without being started and started
-                                without being enabled. Enabling simply
-                                hooks the unit into various suggested
-                                places (for example, so that the unit
-                                is automatically started on boot or
-                                when a particular kind of hardware is
-                                plugged in). Starting actually spawns
-                                the daemon process (in case of service
-                                units), or binds the socket (in case
-                                of socket units), and so
-                                on.</para>
-
-                                <para>Depending on whether
-                                <option>--system</option>,
-                                <option>--user</option> or
-                                <option>--global</option> is specified
-                                this enables the unit for the system,
-                                for the calling user only
-                                or for all future logins of all
-                                users. Note that in the latter case no
-                                systemd daemon configuration is
-                                reloaded.</para>
-                                </listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><command>disable [NAME...]</command></term>
-
-                                <listitem><para>Disables one or more
-                                units. This removes all symlinks to
-                                the specified unit files from the unit
-                                configuration directory, and hence
-                                undoes the changes made by
-                                <command>enable</command>. Note
-                                however that this removes
-                                all symlinks to the unit files
-                                (i.e. including manual additions), not
-                                just those actually created by
-                                <command>enable</command>. This call
-                                implicitly reloads the systemd daemon
-                                configuration after completing the
-                                disabling of the units. Note that this
-                                command does not implicitly stop the
-                                units that are being disabled. If this
-                                is desired an additional
-                                <command>stop</command> command should
-                                be executed afterwards.</para>
-
-                                <para>This command will print the
-                                actions executed. This output may be
-                                suppressed by passing
-                                <option>--quiet</option>.</para>
-                                </listitem>
-
-                                <para>This command honors
-                                <option>--system</option>,
-                                <option>--user</option>,
-                                <option>--global</option> in a similar
-                                way as
-                                <command>enable</command>.</para>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><command>is-enabled [NAME...]</command></term>
-
-                                <listitem><para>Checks whether any of
-                                the specified unit files are enabled
-                                (as with
-                                <command>enable</command>). Returns an
-                                exit code of 0 if at least one is
-                                enabled, non-zero otherwise. Prints
-                                the current enable status. To suppress
-                                this output use
-                                <option>--quiet</option>.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><command>reenable [NAME...]</command></term>
-
-                                <listitem><para>Reenable one or more
-                                unit files, as specified on the
-                                command line. This is a combination of
-                                <command>disable</command> and
-                                <command>enable</command> and is
-                                useful to reset the symlinks a unit is
-                                enabled with to the defaults
-                                configured in the
-                                <literal>[Install]</literal> section
-                                of the unit file.</para>
-                                </listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><command>preset [NAME...]</command></term>
-
-                                <listitem><para>Reset one or more unit
-                                files, as specified on the command
-                                line, to the defaults configured in
-                                the preset policy files. This has the
-                                same effect as
-                                <command>disable</command> or
-                                <command>enable</command>, depending
-                                how the unit is listed in the preset
-                                files. For more information on preset
-                                policy format see
-                                <citerefentry><refentrytitle>systemd.preset</refentrytitle><manvolnum>5</manvolnum></citerefentry>. For
-                                more information on the concept of
-                                presets please consult the <ulink
-                                url="http://freedesktop.org/wiki/Software/systemd/Preset">Preset</ulink>
-                                document.</para>
-                                </listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><command>mask [NAME...]</command></term>
-
-                                <listitem><para>Mask one or more unit
-                                files, as specified on the command
-                                line. This will link these units to
-                                <filename>/dev/null</filename>, making
-                                it impossible to start them. This is a stronger version
-                                of <command>disable</command>, since
-                                it prohibits all kinds of activation
-                                of the unit, including manual
-                                activation. Use this option with
-                                care.</para>
-                                </listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><command>unmask [NAME...]</command></term>
-
-                                <listitem><para>Unmask one or more
-                                unit files, as specified on the
-                                command line. This will undo the
-                                effect of
-                                <command>mask</command>.</para>
-                                </listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><command>link [NAME...]</command></term>
-
-                                <listitem><para>Link a unit file that
-                                is not in the unit file search paths
-                                into the unit file search path. This
-                                requires an absolute path to a unit
-                                file. The effect of this can be undone
-                                with <command>disable</command>. The
-                                effect of this command is that a unit
-                                file is available for
-                                <command>start</command> and other
-                                commands although it isn't installed
-                                directly in the unit search
-                                path.</para>
-                                </listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><command>load [NAME...]</command></term>
-
-                                <listitem><para>Load one or more units
-                                specified on the command line. This
-                                will simply load their configuration
-                                from disk, but not start them. To
-                                start them you need to use the
-                                <command>start</command> command which
-                                will implicitly load a unit that has
-                                not been loaded yet. Note that systemd
-                                garbage collects loaded units that are
-                                not active or referenced by an active
-                                unit. This means that units loaded
-                                this way will usually not stay loaded
-                                for long. Also note that this command
-                                cannot be used to reload unit
-                                configuration. Use the
-                                <command>daemon-reload</command>
-                                command for that. All in all, this
-                                command is of little use except for
-                                debugging.</para>
-                                <para>This command should not be
-                                confused with the
-                                <command>daemon-reload</command> or
-                                <command>reload</command>
-                                commands.</para></listitem>
-                        </varlistentry>
-                        <varlistentry>
-                                <term><command>list-jobs</command></term>
-
-                                <listitem><para>List jobs that are in progress.</para></listitem>
-                        </varlistentry>
-                        <varlistentry>
-                                <term><command>cancel [JOB...]</command></term>
-
-                                <listitem><para>Cancel one or more
-                                jobs specified on the command line by
-                                their numeric job
-                                IDs. If no job id is specified, cancel 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 [NAME]</command></term>
-
-                                <listitem><para> Shows required and
-                                wanted units of the specified unit. If
-                                no unit is specified
-                                <filename>default.target</filename> is
-                                implied. Target units are recursively
-                                expanded.  When <option>--all</option>
-                                is passed all other units aare
-                                recursively expanded as well.</para>
-                                </listitem>
-                        </varlistentry>
-                        <varlistentry>
-                                <term><command>snapshot [NAME]</command></term>
-
-                                <listitem><para>Create a snapshot. If
-                                a snapshot name is specified, the new
-                                snapshot will be named after it. If
-                                none is specified an automatic
-                                snapshot name is generated. In either
-                                case, the snapshot name used is
-                                printed to STDOUT, unless
-                                <option>--quiet</option> is
-                                specified.</para>
-
-                                <para>A snapshot refers to a saved
-                                state of the systemd manager. It is
-                                implemented itself as a unit that is
-                                generated dynamically with this
-                                command and has dependencies on all
-                                units active at the time. At a later
-                                time the user may return to this state
-                                by using the
-                                <command>isolate</command> command on
-                                the snapshot unit.</para></listitem>
-
-                                <para>Snapshots are only useful for
-                                saving and restoring which units are
-                                running or are stopped, they do not
-                                save/restore any other
-                                state. Snapshots are dynamic and lost
-                                on reboot.</para>
-                        </varlistentry>
-                        <varlistentry>
-                                <term><command>delete [NAME...]</command></term>
-
-                                <listitem><para>Remove a snapshot
-                                previously created with
-                                <command>snapshot</command>.</para></listitem>
-                        </varlistentry>
-                        <varlistentry>
-                                <term><command>daemon-reload</command></term>
-
-                                <listitem><para>Reload systemd manager
-                                configuration. This will reload all
-                                unit files and recreate the entire
-                                dependency tree. While the daemon is
-                                reloaded, all sockets systemd listens
-                                on on behalf of user configuration will
-                                stay accessible.</para> <para>This
-                                command should not be confused with
-                                the <command>load</command> or
-                                <command>reload</command>
-                                commands.</para></listitem>
-                        </varlistentry>
-                        <varlistentry>
-                                <term><command>daemon-reexec</command></term>
-
-                                <listitem><para>Reexecute the systemd
-                                manager. This will serialize the
-                                manager state, reexecute the process
-                                and deserialize the state again. This
-                                command is of little use except for
-                                debugging and package
-                                upgrades. Sometimes it might be
-                                helpful as a heavy-weight
-                                <command>daemon-reload</command>. While
-                                the daemon is reexecuted all sockets
-                                systemd listens on on behalf of user
-                                configuration will stay
-                                accessible.</para></listitem>
-                        </varlistentry>
-                        <varlistentry>
-                                <term><command>show-environment</command></term>
-
-                                <listitem><para>Dump the systemd
-                                manager environment block. The
-                                environment block will be dumped in
-                                straight-forward form suitable for
-                                sourcing into a shell script. This
-                                environment block will be passed to
-                                all processes the manager
-                                spawns.</para></listitem>
-                        </varlistentry>
-                        <varlistentry>
-                                <term><command>set-environment [NAME=VALUE...]</command></term>
-
-                                <listitem><para>Set one or more
-                                systemd manager environment variables,
-                                as specified on the command
-                                line.</para></listitem>
-                        </varlistentry>
-                        <varlistentry>
-                                <term><command>unset-environment [NAME...]</command></term>
-
-                                <listitem><para>Unset one or more
-                                systemd manager environment
-                                variables. If only a variable name is
-                                specified it will be removed
-                                regardless of its value. If a variable
-                                and a value are specified the variable
-                                is only removed if it has the
-                                specified value.</para></listitem>
-                        </varlistentry>
-                        <varlistentry>
-                                <term><command>default</command></term>
-
-                                <listitem><para>Enter default
-                                mode. This is mostly equivalent to
-                                <command>start
-                                default.target</command>.</para></listitem>
-                        </varlistentry>
-                        <varlistentry>
-                                <term><command>rescue</command></term>
-
-                                <listitem><para>Enter rescue
-                                mode. This is mostly equivalent to
-                                <command>isolate
-                                rescue.target</command> but also
-                                prints a wall message to all
-                                users.</para></listitem>
-                        </varlistentry>
-                        <varlistentry>
-                                <term><command>emergency</command></term>
-
-                                <listitem><para>Enter emergency
-                                mode. This is mostly equivalent to
-                                <command>isolate
-                                emergency.target</command> but also
-                                prints a wall message to all
-                                users.</para></listitem>
-                        </varlistentry>
-                        <varlistentry>
-                                <term><command>halt</command></term>
-
-                                <listitem><para>Shut down and halt the
-                                system. This is mostly equivalent to
-                                <command>start halt.target</command>
-                                but also prints a wall message to all
-                                users.  If combined with
-                                <option>--force</option> shutdown of
-                                all running services is skipped,
-                                however all processes are killed and
-                                all file systems are unmounted or
-                                mounted read-only, immediately
-                                followed by the system halt.  If
-                                <option>--force</option> is specified
-                                twice the operation is immediately
-                                executed without terminating any
-                                processes or unmounting any file
-                                systems. This may result in data
-                                loss.</para></listitem>
-                        </varlistentry>
-                        <varlistentry>
-                                <term><command>poweroff</command></term>
-
-                                <listitem><para>Shut down and
-                                power-off the system. This is mostly
-                                equivalent to <command>start
-                                poweroff.target</command> but also
-                                prints a wall message to all users. If
-                                combined with <option>--force</option>
-                                shutdown of all running services is
-                                skipped, however all processes are
-                                killed and all file systems are
-                                unmounted or mounted read-only,
-                                immediately followed by the powering
-                                off. If <option>--force</option> is
-                                specified twice the operation is
-                                immediately executed without
-                                terminating any processes or
-                                unmounting any file systems. This may
-                                result in data loss.</para></listitem>
-                        </varlistentry>
-                        <varlistentry>
-                                <term><command>reboot</command></term>
-
-                                <listitem><para>Shut down and reboot
-                                the system. This is mostly equivalent
-                                to <command>start
-                                reboot.target</command> but also
-                                prints a wall message to all users. If
-                                combined with <option>--force</option>
-                                shutdown of all running services is
-                                skipped, however all processes are
-                                killed and all file systems are
-                                unmounted or mounted read-only,
-                                immediately followed by the reboot. If
-                                <option>--force</option> is specified
-                                twice the operation is immediately
-                                executed without terminating any
-                                processes or unmounting any file
-                                systems. This may result in data
-                                loss.</para></listitem>
-                        </varlistentry>
-                        <varlistentry>
-                                <term><command>kexec</command></term>
-
-                                <listitem><para>Shut down and reboot
-                                the system via kexec. This is mostly
-                                equivalent to <command>start
-                                kexec.target</command> but also prints
-                                a wall message to all users. If
-                                combined with <option>--force</option>
-                                shutdown of all running services is
-                                skipped, however all processes are killed
-                                and all file systems are unmounted or
-                                mounted read-only, immediately
-                                followed by the
-                                reboot.</para></listitem>
-                        </varlistentry>
-                        <varlistentry>
-                                <term><command>exit</command></term>
-
-                                <listitem><para>Ask the systemd
-                                manager to quit. This is only
-                                supported for user service managers
-                                (i.e. in conjunction with the
-                                <option>--user</option> option) and
-                                will fail otherwise.</para></listitem>
-                        </varlistentry>
-                        <varlistentry>
-                                <term><command>suspend</command></term>
-
-                                <listitem><para>Suspend the
-                                system. This will trigger activation
-                                of the special
-                                <filename>suspend.target</filename>
-                                target.</para></listitem>
-                        </varlistentry>
-                        <varlistentry>
-                                <term><command>hibernate</command></term>
-
-                                <listitem><para>Hibernate the
-                                system. This will trigger activation
-                                of the special
-                                <filename>hibernate.target</filename>
-                                target.</para></listitem>
-                        </varlistentry>
-                        <varlistentry>
-                                <term><command>hybrid-sleep</command></term>
-
-                                <listitem><para>Hibernate and suspend
-                                the system. This will trigger
-                                activation of the special
-                                <filename>hybrid-sleep.target</filename>
-                                target.</para></listitem>
-                        </varlistentry>
-                        <varlistentry>
-                                <term><command>switch-root [ROOT] [INIT]</command></term>
-
-                                <listitem><para>Switches to a
-                                different root directory and executes
-                                a new system manager process below
-                                it. This is intended for usage in
-                                initial RAM disks ("initrd"), and will
-                                transition from the initrd's system
-                                manager process (a.k.a "init" process)
-                                to the main system manager
-                                process. Takes two arguments: the
-                                directory to make the new root
-                                directory, and the path to the new
-                                system manager binary below it to
-                                execute as PID 1. If the latter is
-                                omitted or the empty string, a
-                                systemd binary will automatically be
-                                searched for and used as init. If the
-                                system manager path is omitted or
-                                equal the empty string the state of
-                                the initrd's system manager process is
-                                passed to the main system manager,
-                                which allows later introspection of the
-                                state of the services involved in the
-                                initrd boot.</para></listitem>
-                        </varlistentry>
-                </variablelist>
-
-        </refsect1>
-
-        <refsect1>
-                <title>Exit status</title>
-
-                <para>On success 0 is returned, a non-zero failure
-                code otherwise.</para>
-        </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>
-                        <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>systemadm</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>journalctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>loginctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>wall</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>systemd.preset</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-                </para>
-        </refsect1>
+  <refentryinfo>
+    <title>systemctl</title>
+    <productname>systemd</productname>
+
+    <authorgroup>
+      <author>
+        <contrib>Developer</contrib>
+        <firstname>Lennart</firstname>
+        <surname>Poettering</surname>
+        <email>lennart at poettering.net</email>
+      </author>
+    </authorgroup>
+  </refentryinfo>
+
+  <refmeta>
+    <refentrytitle>systemctl</refentrytitle>
+    <manvolnum>1</manvolnum>
+  </refmeta>
+
+  <refnamediv>
+    <refname>systemctl</refname>
+    <refpurpose>Control the systemd system and service manager</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>systemctl</command>
+      <arg choice="opt" rep="repeat">OPTIONS</arg>
+      <arg choice="plain">COMMAND</arg>
+      <arg choice="opt" rep="repeat">NAME</arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para><command>systemctl</command> may be used to
+    introspect and control the state of the
+    <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+    system and service manager.</para>
+  </refsect1>
+
+  <refsect1>
+    <title>Options</title>
+
+    <para>The following options are understood:</para>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>-h</option></term>
+        <term><option>--help</option></term>
+
+        <listitem><para>Prints a short help
+        text and exits.</para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--version</option></term>
+
+        <listitem>
+          <para>Prints a short version string and exits.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-t</option></term>
+        <term><option>--type=</option></term>
+
+        <listitem>
+          <para>The argument should be a unit type name such as
+          <option>service</option> and <option>socket</option>, or a
+          unit load state such as <option>loaded</option> and
+          <option>masked</option>.
+          </para>
+
+          <para>If the argument is a unit type, when listing units,
+          limit display to certain unit types. If not specified units
+          of all types will be shown.</para>
+
+          <para>If the argument is a unit load state, when listing
+          units, limit display to certain unit types. If not specified
+          units of in all load states will be shown.</para>
+
+          <para>As a special case, if the argument is
+          <option>help</option>, a list of allowed values will be
+          printed and the program will exit.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-p</option></term>
+        <term><option>--property=</option></term>
+
+        <listitem>
+          <para>When showing unit/job/manager properties, limit
+          display to certain properties as specified as argument. If
+          not specified all set properties are shown. The argument
+          should be a property name, such as
+          <literal>MainPID</literal>. If specified more than once all
+          properties with the specified names are
+          shown.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-a</option></term>
+        <term><option>--all</option></term>
+
+        <listitem>
+          <para>When listing units, show all 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>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--failed</option></term>
+
+        <listitem>
+          <para>When listing units, show only failed units. Do not
+          confuse with <option>--fail</option>.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--full</option></term>
+
+        <listitem>
+          <para>Do not ellipsize unit names, cgroup members, and
+          truncate unit descriptions in the output of
+          <command>list-units</command> and
+          <command>list-jobs</command>.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--fail</option></term>
+
+        <listitem>
+          <para>If the requested operation conflicts with a pending
+          unfinished job, fail the command. If this is not specified
+          the requested operation will replace the pending job, if
+          necessary. Do not confuse with
+          <option>--failed</option>.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--ignore-dependencies</option></term>
+
+        <listitem>
+          <para>When enqueuing a new job ignore all its dependencies
+          and execute it immediately. If passed no required units of
+          the unit passed will be pulled in, and no ordering
+          dependencies will be honored. This is mostly a debugging and
+          rescue tool for the administrator and should not be used by
+          applications.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-i</option></term>
+        <term><option>--ignore-inhibitors</option></term>
+
+        <listitem>
+          <para>When system shutdown or a sleep state is requested,
+          ignore inhibitor locks. Applications can establish inhibitor
+          locks to avoid that certain important operations (such as CD
+          burning or suchlike) are interrupted by system shutdown or a
+          sleep state. Any user may take these locks and privileged
+          users may override these locks. If any locks are taken,
+          shutdown and sleep state requests will normally fail
+          (regardless if privileged or not) and list of active locks
+          is printed. However if <option>--ignore-inhibitors</option>
+          is specified the locks are ignored and not printed, and the
+          operation attempted anyway, possibly requiring additional
+          privileges.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-q</option></term>
+        <term><option>--quiet</option></term>
+
+        <listitem>
+          <para>Suppress output to standard output in
+          <command>snapshot</command>,
+          <command>is-active</command>,
+          <command>is-failed</command>,
+          <command>enable</command> and
+        <command>disable</command>.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--no-block</option></term>
+
+        <listitem>
+          <para>Do not synchronously wait for the requested operation
+          to finish. If this is not specified the job will be
+          verified, enqueued and <command>systemctl</command> will
+          wait until it is completed. By passing this argument it is
+          only verified and enqueued.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--no-legend</option></term>
+
+        <listitem>
+          <para>Do not print a legend, i.e.  the column headers and
+          the footer with hints.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--no-pager</option></term>
+
+        <listitem>
+          <para>Do not pipe output into a pager.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--system</option></term>
+
+        <listitem>
+          <para>Talk to the systemd system manager. (Default)</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--user</option></term>
+
+        <listitem>
+          <para>Talk to the systemd manager of the calling
+          user.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--no-wall</option></term>
+
+        <listitem>
+          <para>Don't send wall message before halt, power-off,
+          reboot.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--global</option></term>
+
+        <listitem>
+          <para>When used with <command>enable</command> and
+          <command>disable</command>, operate on the global user
+          configuration directory, thus enabling or disabling a unit
+          file globally for all future logins of all users.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--no-reload</option></term>
+
+        <listitem>
+          <para>When used with <command>enable</command> and
+          <command>disable</command>, do not implicitly reload daemon
+          configuration after executing the changes.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--no-ask-password</option></term>
+
+        <listitem>
+          <para>When used with <command>start</command> and related
+          commands, disables asking for passwords. Background services
+          may require input of a password or passphrase string, for
+          example to unlock system hard disks or cryptographic
+          certificates. Unless this option is specified and the
+          command is invoked from a terminal
+          <command>systemctl</command> will query the user on the
+          terminal for the necessary secrets. Use this option to
+          switch this behavior off. In this case the password must be
+          supplied by some other means (for example graphical password
+          agents) or the service might fail. This also disables
+          querying the user for authentication for privileged
+          operations.</para>
+        </listitem>
+
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--kill-who=</option></term>
+
+        <listitem>
+          <para>When used with <command>kill</command>, choose which
+          processes to kill. Must be one of <option>main</option>,
+          <option>control</option> or <option>all</option> to select
+          whether to kill only the main process of the unit, the
+          control process or all processes of the unit. If omitted
+          defaults to <option>all</option>.</para>
+        </listitem>
+
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-s</option></term>
+        <term><option>--signal=</option></term>
+
+        <listitem>
+          <para>When used with <command>kill</command>, choose which
+          signal to send to selected processes. Must be one of the
+          well known signal specifiers such as SIGTERM, SIGINT or
+          SIGSTOP. If omitted defaults to
+          <option>SIGTERM</option>.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-f</option></term>
+        <term><option>--force</option></term>
+
+        <listitem>
+          <para>When used with <command>enable</command>, overwrite
+          any existing conflicting symlinks.</para>
+
+          <para>When used with <command>halt</command>,
+          <command>poweroff</command>, <command>reboot</command> or
+          <command>kexec</command> execute the selected operation
+          without shutting down all units. However, all processes will
+          be killed forcibly and all file systems are unmounted or
+          remounted read-only. This is hence a drastic but relatively
+          safe option to request an immediate reboot. If
+          <option>--force</option> is specified twice for these
+          operations, they will be executed immediately without
+          terminating any processes or umounting any file
+          systems. Warning: specifying <option>--force</option> twice
+          with any of these operations might result in data
+          loss.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--root=</option></term>
+
+        <listitem>
+          <para>When used with
+          <command>enable</command>/<command>disable</command>/<command>is-enabled</command>
+          (and related commands), use alternative root path when
+          looking for unit files.</para>
+        </listitem>
+
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--runtime</option></term>
+
+        <listitem>
+          <para>When used with
+          <command>enable</command>/<command>disable</command>/<command>is-enabled</command>
+          (and related commands), make changes only temporarily, so
+          that they are dropped on the next reboot. This will have the
+          effect that changes are not made in subdirectories of
+          <filename>/etc</filename> but in <filename>/run</filename>,
+          with identical immediate effects, however, since the latter
+          is lost on reboot, the changes are lost too.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-H</option></term>
+        <term><option>--host</option></term>
+
+        <listitem>
+          <para>Execute operation remotely. Specify a hostname, or
+          username and hostname separated by @, to connect to. This
+          will use SSH to talk to the remote systemd
+          instance.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-P</option></term>
+        <term><option>--privileged</option></term>
+
+        <listitem>
+          <para>Acquire privileges via PolicyKit before executing the
+          operation.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-n</option></term>
+        <term><option>--lines=</option></term>
+
+        <listitem>
+          <para>When used with <command>status</command> controls the
+          number of journal lines to show, counting from the most
+          recent ones. Takes a positive integer argument. Defaults to
+          10.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-o</option></term>
+        <term><option>--output=</option></term>
+
+        <listitem>
+          <para>When used with <command>status</command> controls the
+          formatting of the journal entries that are shown. For the
+          available choices see
+          <citerefentry><refentrytitle>journalctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
+          Defaults to <literal>short</literal>.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>Commands</title>
+
+    <para>The following commands are understood:</para>
+
+    <variablelist>
+      <varlistentry>
+        <term><command>list-units</command></term>
+
+        <listitem>
+          <para>List known units (subject to limitations specified
+          with <option>-t</option>).</para>
+
+          <para>This is the default command.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><command>start <replaceable>NAME</replaceable>...</command></term>
+
+        <listitem>
+          <para>Start (activate) one or more units specified on the
+          command line.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><command>stop <replaceable>NAME</replaceable>...</command></term>
+
+        <listitem>
+          <para>Stop (deactivate) one or more units specified on the
+          command line.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><command>reload <replaceable>NAME</replaceable>...</command></term>
+
+        <listitem>
+          <para>Asks all units listed on the command line to reload
+          their configuration. Note that this will reload the
+          service-specific configuration, not the unit configuration
+          file of systemd. If you want systemd to reload the
+          configuration file of a unit use the
+          <command>daemon-reload</command> command. In other words:
+          for the example case of Apache, this will reload Apache's
+          <filename>httpd.conf</filename> in the web server, not the
+          <filename>apache.service</filename> systemd unit
+          file. </para>
+
+          <para>This command should not be confused with the
+          <command>daemon-reload</command> or <command>load</command>
+          commands.</para>
+        </listitem>
+
+      </varlistentry>
+      <varlistentry>
+        <term><command>restart <replaceable>NAME</replaceable>...</command></term>
+
+        <listitem>
+          <para>Restart one or more units specified on the command
+          line. If the units are not running yet they will be
+          started.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><command>try-restart <replaceable>NAME</replaceable>...</command></term>
+
+        <listitem>
+          <para>Restart one or more units specified on the command
+          line if the units are running. Do nothing if units are not
+          running.  Note that for compatibility with Red Hat init
+          scripts <command>condrestart</command> is equivalent to this
+          command.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><command>reload-or-restart <replaceable>NAME</replaceable>...</command></term>
+
+        <listitem>
+          <para>Reload one or more units if they support it. If not,
+          restart them instead. If the units are not running yet they
+          will be started.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><command>reload-or-try-restart <replaceable>NAME</replaceable>...</command></term>
+
+        <listitem>
+          <para>Reload one or more units if they support it. If not,
+          restart them instead. Do nothing if the units are not
+          running. Note that for compatibility with SysV init scripts
+          <command>force-reload</command> is equivalent to this
+          command.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><command>isolate <replaceable>NAME</replaceable></command></term>
+
+        <listitem>
+          <para>Start the unit specified on the command line and its
+          dependencies and stop all others.</para>
+
+          <para>This is similar to changing the runlevel in a
+          traditional init system. The <command>isolate</command>
+          command will immediately stop processes that are not enabled
+          in the new unit, possibly including the graphical
+          environment or terminal you are currently using.</para>
+
+          <para>Note that this is allowed only on units where
+          <option>AllowIsolate=</option> is enabled. See
+          <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+          for details.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><command>kill <replaceable>NAME</replaceable>...</command></term>
+
+        <listitem>
+          <para>Send a signal to one or more processes of the
+          unit. Use <option>--kill-who=</option> to select which
+          process to kill. Use <option>--kill-mode=</option> to select
+          the kill mode and <option>--signal=</option> to select the
+          signal to send.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><command>is-active <replaceable>NAME</replaceable>...</command></term>
+
+        <listitem>
+          <para>Check whether any of the specified units are active
+          (i.e. running). Returns an exit code 0 if at least one is
+          active, non-zero otherwise. Unless <option>--quiet</option>
+          is specified this will also print the current unit state to
+          STDOUT.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><command>is-failed <replaceable>NAME</replaceable>...</command></term>
+
+        <listitem>
+          <para>Check whether any of the specified units are failed.
+          Returns an exit code 0 if at least one is failed, non-zero
+          otherwise. Unless <option>--quiet</option> is specified this
+          will also print the current unit state to
+          STDOUT.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><command>status [<replaceable>NAME</replaceable>...|<replaceable>PID</replaceable>...]</command></term>
+
+        <listitem>
+          <para>Show terse runtime status information about one or
+          more units, followed by most recent log data from the
+          journal. If no units are specified, show all units (subject
+          to limitations specified with <option>-t</option>). If a PID
+          is passed show information about the unit the process
+          belongs to.</para>
+
+          <para>This function is intended to generate human-readable
+          output. If you are looking for computer-parsable output, use
+          <command>show</command> instead.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><command>show [<replaceable>NAME</replaceable>...|<replaceable>JOB</replaceable>...]</command></term>
+
+        <listitem>
+          <para>Show properties of one or more units, jobs, or the
+          manager itself. If no argument is specified properties of
+          the manager will be shown. If a unit name is specified
+          properties of the unit is shown, and if a job id is
+          specified properties of the job is shown. By default, empty
+          properties are suppressed. Use <option>--all</option> to
+          show those too. To select specific properties to show use
+          <option>--property=</option>. This command is intended to be
+          used whenever computer-parsable output is required. Use
+          <command>status</command> if you are looking for formatted
+          human-readable output.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><command>help <replaceable>NAME</replaceable>...|<replaceable>PID</replaceable>...</command></term>
+
+        <listitem>
+          <para>Show manual pages for one or more units, if
+          available. If a PID is passed the manual pages for the unit
+          the process of the PID belongs to is
+          shown.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><command>reset-failed [<replaceable>NAME</replaceable>...]</command></term>
+
+        <listitem>
+          <para>Reset the <literal>failed</literal> state of the
+          specified units, or if no unit name is passed of all
+          units. When a unit fails in some way (i.e. process exiting
+          with non-zero error code, terminating abnormally or timing
+          out) it will automatically enter the
+          <literal>failed</literal> state and its exit code and status
+          is recorded for introspection by the administrator until the
+          service is restarted or reset with this command.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><command>list-unit-files</command></term>
+
+        <listitem>
+          <para>List installed unit files.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><command>enable <replaceable>NAME</replaceable>...</command></term>
+
+        <listitem>
+          <para>Enable one or more unit files or unit file instances,
+          as specified on the command line. This will create a number
+          of symlinks as encoded in the <literal>[Install]</literal>
+          sections of the unit files. After the symlinks have been
+          created the systemd configuration is reloaded (in a way that
+          is equivalent to <command>daemon-reload</command>) to ensure
+          the changes are taken into account immediately. Note that
+          this does not have the effect that any of the units enabled
+          are also started at the same time. If this is desired a
+          separate <command>start</command> command must be invoked
+          for the unit. Also note that in case of instance enablement,
+          symlinks named same as instances are created in install
+          location, however they all point to the same template unit
+          file.</para>
+
+          <para>This command will print the actions executed. This
+          output may be suppressed by passing <option>--quiet</option>.
+          </para>
+
+          <para>Note that this operation creates only the suggested
+          symlinks for the units. While this command is the
+          recommended way to manipulate the unit configuration
+          directory, the administrator is free to make additional
+          changes manually, by placing or removing symlinks in the
+          directory. This is particularly useful to create
+          configurations that deviate from the suggested default
+          installation. In this case the administrator must make sure
+          to invoke <command>daemon-reload</command> manually as
+          necessary, to ensure his changes are taken into account.
+          </para>
+
+          <para>Enabling units should not be confused with starting
+          (activating) units, as done by the <command>start</command>
+          command. Enabling and starting units is orthogonal: units
+          may be enabled without being started and started without
+          being enabled. Enabling simply hooks the unit into various
+          suggested places (for example, so that the unit is
+          automatically started on boot or when a particular kind of
+          hardware is plugged in). Starting actually spawns the daemon
+          process (in case of service units), or binds the socket (in
+          case of socket units), and so on.</para>
+
+          <para>Depending on whether <option>--system</option>,
+          <option>--user</option> or <option>--global</option> is
+          specified this enables the unit for the system, for the
+          calling user only or for all future logins of all
+          users. Note that in the last case no systemd daemon
+          configuration is reloaded.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><command>disable <replaceable>NAME</replaceable>...</command></term>
+
+        <listitem>
+          <para>Disables one or more units. This removes all symlinks
+          to the specified unit files from the unit configuration
+          directory, and hence undoes the changes made by
+          <command>enable</command>. Note however that this removes
+          all symlinks to the unit files (i.e. including manual
+          additions), not just those actually created by
+          <command>enable</command>. This call implicitly reloads the
+          systemd daemon configuration after completing the disabling
+          of the units. Note that this command does not implicitly
+          stop the units that are being disabled. If this is desired
+          an additional <command>stop</command> command should be
+          executed afterwards.</para>
+
+          <para>This command will print the actions executed. This
+          output may be suppressed by passing <option>--quiet</option>.
+          </para>
+
+          <para>This command honors <option>--system</option>,
+          <option>--user</option>, <option>--global</option> in a
+          similar way as <command>enable</command>.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><command>is-enabled <replaceable>NAME</replaceable>...</command></term>
+
+        <listitem>
+          <para>Checks whether any of the specified unit files are
+          enabled (as with <command>enable</command>). Returns an exit
+          code of 0 if at least one is enabled, non-zero
+          otherwise. Prints the current enable status. To suppress
+          this output use <option>--quiet</option>.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><command>reenable <replaceable>NAME</replaceable>...</command></term>
+
+        <listitem>
+          <para>Reenable one or more unit files, as specified on the
+          command line. This is a combination of
+          <command>disable</command> and <command>enable</command> and
+          is useful to reset the symlinks a unit is enabled with to
+          the defaults configured in the <literal>[Install]</literal>
+          section of the unit file.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><command>preset <replaceable>NAME</replaceable>...</command></term>
+
+        <listitem>
+          <para>Reset one or more unit files, as specified on the
+          command line, to the defaults configured in the preset
+          policy files. This has the same effect as
+          <command>disable</command> or <command>enable</command>,
+          depending how the unit is listed in the preset files. For
+          more information on preset policy format see
+          <citerefentry><refentrytitle>systemd.preset</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
+          For more information on the concept of presets please
+          consult the
+          <ulink url="http://freedesktop.org/wiki/Software/systemd/Preset">Preset</ulink>
+          document.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><command>mask <replaceable>NAME</replaceable>...</command></term>
+
+        <listitem>
+          <para>Mask one or more unit files, as specified on the
+          command line. This will link these units to
+          <filename>/dev/null</filename>, making it impossible to
+          start them. This is a stronger version of
+          <command>disable</command>, since it prohibits all kinds of
+          activation of the unit, including manual activation. Use
+          this option with care.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><command>unmask <replaceable>NAME</replaceable>...</command></term>
+
+        <listitem>
+          <para>Unmask one or more unit files, as specified on the
+          command line. This will undo the effect of
+          <command>mask</command>.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><command>link <replaceable>FILENAME</replaceable>...</command></term>
+
+        <listitem>
+          <para>Link a unit file that is not in the unit file search
+          paths into the unit file search path. This requires an
+          absolute path to a unit file. The effect of this can be
+          undone with <command>disable</command>. The effect of this
+          command is that a unit file is available for
+          <command>start</command> and other commands although it
+          isn't installed directly in the unit search path.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><command>load <replaceable>NAME</replaceable>...</command></term>
+
+        <listitem>
+          <para>Load one or more units specified on the command
+          line. This will simply load their configuration from disk,
+          but not start them. To start them you need to use the
+          <command>start</command> command which will implicitly load
+          a unit that has not been loaded yet. Note that systemd
+          garbage collects loaded units that are not active or
+          referenced by an active unit. This means that units loaded
+          this way will usually not stay loaded for long. Also note
+          that this command cannot be used to reload unit
+          configuration. Use the <command>daemon-reload</command>
+          command for that. All in all, this command is of little use
+          except for debugging.</para>
+
+          <para>This command should not be confused with the
+          <command>daemon-reload</command> or
+          <command>reload</command>.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><command>list-jobs</command></term>
+
+        <listitem>
+          <para>List jobs that are in progress.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><command>cancel <replaceable>JOB</replaceable>...</command></term>
+
+        <listitem>
+          <para>Cancel one or more jobs specified on the command line
+          by their numeric job IDs. If no job id is specified, cancel
+          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>
+
+        <listitem>
+          <para>Shows required and wanted units of the specified
+          unit. If no unit is specified
+          <filename>default.target</filename> is implied. Target units
+          are recursively expanded.  When <option>--all</option> is
+          passed all other units are recursively expanded as
+          well.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><command>snapshot [<replaceable>NAME</replaceable>]</command></term>
+
+        <listitem>
+          <para>Create a snapshot. If a snapshot name is specified,
+          the new snapshot will be named after it. If none is
+          specified an automatic snapshot name is generated. In either
+          case, the snapshot name used is printed to STDOUT, unless
+          <option>--quiet</option> is specified.</para>
+
+          <para>A snapshot refers to a saved state of the systemd
+          manager. It is implemented itself as a unit that is
+          generated dynamically with this command and has dependencies
+          on all units active at the time. At a later time the user
+          may return to this state by using the
+          <command>isolate</command> command on the snapshot unit.
+          </para>
+
+          <para>Snapshots are only useful for saving and restoring
+          which units are running or are stopped, they do not
+          save/restore any other state. Snapshots are dynamic and lost
+          on reboot.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><command>delete <replaceable>NAME</replaceable>...</command></term>
+
+        <listitem>
+          <para>Remove a snapshot previously created with
+          <command>snapshot</command>.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><command>daemon-reload</command></term>
+
+        <listitem>
+          <para>Reload systemd manager configuration. This will reload
+          all unit files and recreate the entire dependency
+          tree. While the daemon is reloaded, all sockets systemd
+          listens on on behalf of user configuration will stay
+          accessible.</para> <para>This command should not be confused
+          with the <command>load</command> or
+          <command>reload</command> commands.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><command>daemon-reexec</command></term>
+
+        <listitem>
+          <para>Reexecute the systemd manager. This will serialize the
+          manager state, reexecute the process and deserialize the
+          state again. This command is of little use except for
+          debugging and package upgrades. Sometimes it might be
+          helpful as a heavy-weight <command>daemon-reload</command>.
+          While the daemon is reexecuted all sockets systemd listens
+          on on behalf of user configuration will stay accessible.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><command>show-environment</command></term>
+
+        <listitem>
+          <para>Dump the systemd manager environment block. The
+          environment block will be dumped in straight-forward form
+          suitable for sourcing into a shell script. This environment
+          block will be passed to all processes the manager
+          spawns.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><command>set-environment <replaceable>VARIABLE=VALUE</replaceable>...</command></term>
+
+        <listitem>
+          <para>Set one or more systemd manager environment variables,
+          as specified on the command line.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><command>unset-environment <replaceable>VARIABLE</replaceable>...</command></term>
+
+        <listitem>
+          <para>Unset one or more systemd manager environment
+          variables. If only a variable name is specified it will be
+          removed regardless of its value. If a variable and a value
+          are specified the variable is only removed if it has the
+          specified value.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><command>default</command></term>
+
+        <listitem>
+          <para>Enter default mode. This is mostly equivalent to
+          <command>start default.target</command>.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><command>rescue</command></term>
+
+        <listitem>
+          <para>Enter rescue mode. This is mostly equivalent to
+          <command>isolate rescue.target</command> but also prints a
+          wall message to all users.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><command>emergency</command></term>
+
+        <listitem>
+          <para>Enter emergency mode. This is mostly equivalent to
+          <command>isolate emergency.target</command> but also prints
+          a wall message to all users.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><command>halt</command></term>
+
+        <listitem>
+          <para>Shut down and halt the system. This is mostly
+          equivalent to <command>start halt.target</command> but also
+          prints a wall message to all users.  If combined with
+          <option>--force</option> shutdown of all running services is
+          skipped, however all processes are killed and all file
+          systems are unmounted or mounted read-only, immediately
+          followed by the system halt.  If <option>--force</option> is
+          specified twice the operation is immediately executed
+          without terminating any processes or unmounting any file
+          systems. This may result in data loss.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><command>poweroff</command></term>
+
+        <listitem>
+          <para>Shut down and power-off the system. This is mostly
+          equivalent to <command>start poweroff.target</command> but
+          also prints a wall message to all users. If combined with
+          <option>--force</option> shutdown of all running services is
+          skipped, however all processes are killed and all file
+          systems are unmounted or mounted read-only, immediately
+          followed by the powering off. If <option>--force</option> is
+          specified twice the operation is immediately executed
+          without terminating any processes or unmounting any file
+          systems. This may result in data loss.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><command>reboot</command></term>
+
+        <listitem>
+          <para>Shut down and reboot the system. This is mostly
+          equivalent to <command>start reboot.target</command> but
+          also prints a wall message to all users. If combined with
+          <option>--force</option> shutdown of all running services is
+          skipped, however all processes are killed and all file
+          systems are unmounted or mounted read-only, immediately
+          followed by the reboot. If <option>--force</option> is
+          specified twice the operation is immediately executed
+          without terminating any processes or unmounting any file
+          systems. This may result in data loss.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><command>kexec</command></term>
+
+        <listitem>
+          <para>Shut down and reboot the system via kexec. This is
+          mostly equivalent to <command>start kexec.target</command>
+          but also prints a wall message to all users. If combined
+          with <option>--force</option> shutdown of all running
+          services is skipped, however all processes are killed and
+          all file systems are unmounted or mounted read-only,
+          immediately followed by the reboot.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><command>exit</command></term>
+
+        <listitem>
+          <para>Ask the systemd manager to quit. This is only
+          supported for user service managers (i.e. in conjunction
+          with the <option>--user</option> option) and will fail
+          otherwise.</para>
+        </listitem>
+
+      </varlistentry>
+      <varlistentry>
+        <term><command>suspend</command></term>
+
+        <listitem>
+          <para>Suspend the system. This will trigger activation of
+          the special <filename>suspend.target</filename> target.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><command>hibernate</command></term>
+
+        <listitem>
+          <para>Hibernate the system. This will trigger activation of
+          the special <filename>hibernate.target</filename> target.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><command>hybrid-sleep</command></term>
+
+        <listitem>
+          <para>Hibernate and suspend the system. This will trigger
+          activation of the special
+          <filename>hybrid-sleep.target</filename> target.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><command>switch-root <replaceable>ROOT</replaceable> [<replaceable>INIT</replaceable>]</command></term>
+
+        <listitem>
+          <para>Switches to a different root directory and executes a
+          new system manager process below it. This is intended for
+          usage in initial RAM disks ("initrd"), and will transition
+          from the initrd's system manager process (a.k.a "init"
+          process) to the main system manager process. Takes two
+          arguments: the directory to make the new root directory, and
+          the path to the new system manager binary below it to
+          execute as PID 1. If the latter is omitted or the empty
+          string, a systemd binary will automatically be searched for
+          and used as init. If the system manager path is omitted or
+          equal to the empty string the state of the initrd's system
+          manager process is passed to the main system manager, which
+          allows later introspection of the state of the services
+          involved in the initrd boot.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
+  </refsect1>
+
+  <refsect1>
+    <title>Exit status</title>
+
+    <para>On success 0 is returned, a non-zero failure
+    code otherwise.</para>
+  </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>
+      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>systemadm</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>journalctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>loginctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>wall</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>systemd.preset</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+    </para>
+  </refsect1>
 
 </refentry>

commit 6d2679917919f1d59bf677d719fb84aedf8b9558
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Sat Feb 16 15:16:24 2013 -0500

    bootchart: rename --filter to --no-filter
    
    Turning off filtering with --filter is just too confusing.
    Config option "Filter" doesn't have to be changed, here
    "Filter=yes" already meant to filter.

diff --git a/man/systemd-bootchart.xml b/man/systemd-bootchart.xml
index 3b755d1..a4770fc 100644
--- a/man/systemd-bootchart.xml
+++ b/man/systemd-bootchart.xml
@@ -173,7 +173,7 @@
 
                         <varlistentry>
                                 <term><option>-F</option></term>
-                                <term><option>--filter</option></term>
+                                <term><option>--no-filter</option></term>
                                 <listitem><para>Disable filtering of tasks that
                                 did not contribute significantly to the boot. Processes
                                 that are too short-lived (only seen in one sample) or
diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c
index 42b9103..af573da 100644
--- a/src/bootchart/bootchart.c
+++ b/src/bootchart/bootchart.c
@@ -143,17 +143,17 @@ int main(int argc, char *argv[])
 
         while (1) {
                 static struct option opts[] = {
-                        {"rel",      no_argument,        NULL,  'r'},
-                        {"freq",     required_argument,  NULL,  'f'},
-                        {"samples",  required_argument,  NULL,  'n'},
-                        {"pss",      no_argument,        NULL,  'p'},
-                        {"output",   required_argument,  NULL,  'o'},
-                        {"init",     required_argument,  NULL,  'i'},
-                        {"filter",   no_argument,        NULL,  'F'},
-                        {"help",     no_argument,        NULL,  'h'},
-                        {"scale-x",  required_argument,  NULL,  'x'},
-                        {"scale-y",  required_argument,  NULL,  'y'},
-                        {"entropy",  no_argument,        NULL,  'e'},
+                        {"rel",       no_argument,        NULL,  'r'},
+                        {"freq",      required_argument,  NULL,  'f'},
+                        {"samples",   required_argument,  NULL,  'n'},
+                        {"pss",       no_argument,        NULL,  'p'},
+                        {"output",    required_argument,  NULL,  'o'},
+                        {"init",      required_argument,  NULL,  'i'},
+                        {"no-filter", no_argument,        NULL,  'F'},
+                        {"help",      no_argument,        NULL,  'h'},
+                        {"scale-x",   required_argument,  NULL,  'x'},
+                        {"scale-y",   required_argument,  NULL,  'y'},
+                        {"entropy",   no_argument,        NULL,  'e'},
                         {NULL, 0, NULL, 0}
                 };
 
@@ -209,18 +209,18 @@ int main(int argc, char *argv[])
                         break;
                 case 'h':
                         fprintf(stderr, "Usage: %s [OPTIONS]\n", argv[0]);
-                        fprintf(stderr, " --rel,     -r            Record time relative to recording\n");
-                        fprintf(stderr, " --freq,    -f N          Sample frequency [%f]\n", hz);
-                        fprintf(stderr, " --samples, -n N          Stop sampling at [%d] samples\n", len);
-                        fprintf(stderr, " --scale-x, -x N          Scale the graph horizontally [%f] \n", scale_x);
-                        fprintf(stderr, " --scale-y, -y N          Scale the graph vertically [%f] \n", scale_y);
-                        fprintf(stderr, " --pss,     -p            Enable PSS graph (CPU intensive)\n");
-                        fprintf(stderr, " --entropy, -e            Enable the entropy_avail graph\n");
-                        fprintf(stderr, " --output,  -o [PATH]     Path to output files [%s]\n", output_path);
-                        fprintf(stderr, " --init,    -i [PATH]     Path to init executable [%s]\n", init_path);
-                        fprintf(stderr, " --filter,  -F            Disable filtering of processes from the graph\n");
+                        fprintf(stderr, " --rel,       -r          Record time relative to recording\n");
+                        fprintf(stderr, " --freq,      -f f        Sample frequency [%f]\n", hz);
+                        fprintf(stderr, " --samples,   -n N        Stop sampling at [%d] samples\n", len);
+                        fprintf(stderr, " --scale-x,   -x N        Scale the graph horizontally [%f] \n", scale_x);
+                        fprintf(stderr, " --scale-y,   -y N        Scale the graph vertically [%f] \n", scale_y);
+                        fprintf(stderr, " --pss,       -p          Enable PSS graph (CPU intensive)\n");
+                        fprintf(stderr, " --entropy,   -e          Enable the entropy_avail graph\n");
+                        fprintf(stderr, " --output,    -o [PATH]   Path to output files [%s]\n", output_path);
+                        fprintf(stderr, " --init,      -i [PATH]   Path to init executable [%s]\n", init_path);
+                        fprintf(stderr, " --no-filter, -F          Disable filtering of processes from the graph\n");
                         fprintf(stderr, "                          that are of less importance or short-lived\n");
-                        fprintf(stderr, " --help,    -h            Display this message\n");
+                        fprintf(stderr, " --help,      -h          Display this message\n");
                         fprintf(stderr, "See bootchart.conf for more information.\n");
                         exit (EXIT_SUCCESS);
                         break;

commit 547ba5a9e854c2811c8452123dae8caa01e1e26e
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Sat Feb 16 13:29:28 2013 -0500

    bootchart: provide better error messages

diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c
index 0176327..42b9103 100644
--- a/src/bootchart/bootchart.c
+++ b/src/bootchart/bootchart.c
@@ -167,13 +167,19 @@ int main(int argc, char *argv[])
                         relative = true;
                         break;
                 case 'f':
-                        safe_atod(optarg, &hz);
+                        r = safe_atod(optarg, &hz);
+                        if (r < 0)
+                                log_warning("failed to parse --freq/-f argument '%s': %s",
+                                            optarg, strerror(-r));
                         break;
                 case 'F':
                         filter = false;
                         break;
                 case 'n':
-                        safe_atoi(optarg, &len);
+                        r = safe_atoi(optarg, &len);
+                        if (r < 0)
+                                log_warning("failed to parse --samples/-n argument '%s': %s",
+                                            optarg, strerror(-r));
                         break;
                 case 'o':
                         path_kill_slashes(optarg);
@@ -187,10 +193,16 @@ int main(int argc, char *argv[])
                         pss = true;
                         break;
                 case 'x':
-                        safe_atod(optarg, &scale_x);
+                        r = safe_atod(optarg, &scale_x);
+                        if (r < 0)
+                                log_warning("failed to parse --scale-x/-x argument '%s': %s",
+                                            optarg, strerror(-r));
                         break;
                 case 'y':
-                        safe_atod(optarg, &scale_y);
+                        r = safe_atod(optarg, &scale_y);
+                        if (r < 0)
+                                log_warning("failed to parse --scale-y/-y argument '%s': %s",
+                                            optarg, strerror(-r));
                         break;
                 case 'e':
                         entropy = true;
@@ -209,7 +221,7 @@ int main(int argc, char *argv[])
                         fprintf(stderr, " --filter,  -F            Disable filtering of processes from the graph\n");
                         fprintf(stderr, "                          that are of less importance or short-lived\n");
                         fprintf(stderr, " --help,    -h            Display this message\n");
-                        fprintf(stderr, "See the installed README and bootchartd.conf.example for more information.\n");
+                        fprintf(stderr, "See bootchart.conf for more information.\n");
                         exit (EXIT_SUCCESS);
                         break;
                 default:
@@ -228,7 +240,7 @@ int main(int argc, char *argv[])
         }
 
         /*
-         * If the kernel executed us through init=/sbin/bootchartd, then
+         * If the kernel executed us through init=/usr/lib/systemd/systemd-bootchart, then
          * fork:
          * - parent execs executable specified via init_path[] (/sbin/init by default) as pid=1
          * - child logs data
@@ -352,13 +364,13 @@ int main(int argc, char *argv[])
         }
 
         if (!of) {
-                perror("open output_file");
+                fprintf(stderr, "opening output file '%s': %m\n", output_file);
                 exit (EXIT_FAILURE);
         }
 
         svg_do(build);
 
-        fprintf(stderr, "bootchartd: Wrote %s\n", output_file);
+        fprintf(stderr, "systemd-bootchart wrote %s\n", output_file);
         fclose(of);
 
         closedir(proc);
@@ -377,7 +389,7 @@ int main(int argc, char *argv[])
 
         /* don't complain when overrun once, happens most commonly on 1st sample */
         if (overrun > 1)
-                fprintf(stderr, "bootchartd: Warning: sample time overrun %i times\n", overrun);
+                fprintf(stderr, "systemd-boochart: Warning: sample time overrun %i times\n", overrun);
 
         return 0;
 }

commit f1c24fea94e19cf2108abbeed1d36ded7102ab98
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Sat Feb 16 12:40:33 2013 -0500

    man: move bootchart README to manpage, docbooksify

diff --git a/README b/README
index f20bd38..297d8f7 100644
--- a/README
+++ b/README
@@ -63,6 +63,13 @@ REQUIREMENTS:
         dracut (optional)
         PolicyKit (optional)
 
+        For systmed-bootchart a kernel with procfs support and several
+        proc output options enabled is required:
+
+        CONFIG_PROC_FS
+        CONFIG_SCHEDSTATS
+        CONFIG_SCHED_DEBUG
+
         When building from git you need the following additional dependencies:
 
         docbook-xsl
diff --git a/man/systemd-bootchart.xml b/man/systemd-bootchart.xml
index f87f821..3b755d1 100644
--- a/man/systemd-bootchart.xml
+++ b/man/systemd-bootchart.xml
@@ -48,52 +48,84 @@
 
         <refnamediv>
                 <refname>systemd-bootchart</refname>
-                <refpurpose>Boot performance analysis graphing tool</refpurpose>
+                <refpurpose>Boot performance graphing tool</refpurpose>
         </refnamediv>
 
         <refsect1>
                 <title>Description</title>
-
-                <para>systemd-bootchart is a tool used to analyze a boot sequence.
-                It collects system information pertaining to the CPU and disk load, as
-                well as per-process information, and then creates a chart with this
-                information. Usually it is invoked by setting the init to
-                <filename>systemd-bootchart</filename> on the kernel command line. It
-                be run after boot to analyze running processes, though it is recommended
-                to use the <option>--rel</option> switch when doing this.</para>
-
-                <para>After collecting a certain amount of data (default: 20 seconds) it
-                will write the SVG chart to <filename>/run/log</filename>. This chart
-                can be used to find problems in the start up sequence and where these
-                problems exist. It is essentially a more detailed version of the
-                systemd-analyze plot function.</para>
+                <para>
+                        <command>systemd-bootchart</command> is a
+                        tool, usually run at system startup, that
+                        collects the CPU load, disk load, memory
+                        usage, as well as per-process information from
+                        a running system. Collected results are output
+                        as an SVG graph. Normally, systemd-bootchart
+                        is invoked by the kernel by passing
+                        <option>init=<filename>/usr/lib/systemd/systemd-bootchart</filename></option>
+                        on the kernel commandline. systemd-bootchart will then
+                        fork the real init off to resume normal system
+                        startup, while monitoring and logging startup
+                        information in the background.
+                </para>
+                <para>
+                        After collecting a certain amount of data
+                        (usually 15-30 seconds, default 20 s) the
+                        logging stops and a graph is generated from
+                        the logged information. This graph contains
+                        vital clues as to which resources are being used,
+                        in which order, and where possible problems
+                        exist in the startup sequence of the system.
+                        It is essentially a more detailed version of
+                        the <command>systemd-analyze</command>
+                        <command>plot</command> function.
+                </para>
+                <para>
+                        Of course, bootchart can also be used at any
+                        moment in time to collect and graph some data
+                        for an amount of time. It is
+                        recommended to use the <option>--rel</option>
+                        switch in this case.
+                </para>
+                <para>
+                        Bootchart does not require root privileges,
+                        and will happily run as a normal user.
+                </para>
+                <para>
+                        Bootchart graphs are by default written
+                        time-stamped in <filename>/run/log</filename>.
+                </para>
 
         </refsect1>
 
         <refsect1>
                 <title>Invocation</title>
 
-                <para>systemd-bootchart can be invoked in several different ways:</para>
+                <para><command>systemd-bootchart</command> can be invoked in several different ways:</para>
 
                 <variablelist>
 
                         <varlistentry>
                                 <term><emphasis>Kernel invocation</emphasis></term>
-                                <listitem><para>The kernel can invoke systemd-bootchart
-                                instead of the init process. In itself, systemd-bootchart
-                                will invoke <filename>/sbin/init</filename> if invoked in
-                                this manner.</para></listitem>
+                                <listitem><para>The kernel can invoke
+                                <command>systemd-bootchart</command>
+                                instead of the init process. In turn,
+                                <command>systemd-bootchart</command>
+                                will invoke <command>/sbin/init</command>.
+                                </para></listitem>
                         </varlistentry>
 
                         <varlistentry>
                                 <term><emphasis>Started as a standalone program</emphasis></term>
-                                <listitem><para>One can execute systemd-bootchart as
-                                normal application from the commandline. In this mode
-                                it is highly recommended to pass the "-r" flag in order
-                                to not graph the time elapsed since boot and before
-                                systemd-bootchart was started, as it may result in
-                                extremely large graphs.
-                                </para></listitem>
+                                <listitem><para>One can execute
+                                <command>systemd-bootchart</command>
+                                as normal application from the
+                                commandline. In this mode it is highly
+                                recommended to pass the
+                                <option>-r</option> flag in order to
+                                not graph the time elapsed since boot
+                                and before systemd-bootchart was
+                                started, as it may result in extremely
+                                large graphs.  </para></listitem>
                         </varlistentry>
                 </variablelist>
         </refsect1>
@@ -101,25 +133,30 @@
         <refsect1>
                 <title>Options</title>
 
-                <para>These options can be set globally in the <filename>/etc/systemd/bootchart.conf</filename>
-                file.</para>
+                <para>These options can also be set in the
+                <filename>/etc/systemd/bootchart.conf</filename>
+                file. See
+                <citerefentry><refentrytitle>bootchart.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
+                </para>
 
                 <variablelist>
 
                         <varlistentry>
                                 <term><option>-n</option></term>
-                                <term><option>--sample N</option></term>
-                                <listitem><para>Specify the amount of samples, N, to
-                                record total before bootchart exits. Each sample will
-                                record at intervals defined by --freq.</para></listitem>
+                                <term><option>--sample <replaceable>N</replaceable></option></term>
+                                <listitem><para>Specify the number of
+                                samples, <replaceable>N</replaceable>,
+                                to record. Samples will be recorded at
+                                intervals defined with <option>--freq</option>.
+                                </para></listitem>
                         </varlistentry>
 
                         <varlistentry>
                                 <term><option>-f</option></term>
-                                <term><option>--freq N</option></term>
-                                <listitem><para>Specify the sample log frequency, N.
-                                This can be a fractional number, but must be larger than
-                                0.0. Most systems can cope with values under 25-50 without
+                                <term><option>--freq <replaceable>f</replaceable></option></term>
+                                <listitem><para>Specify the sample log
+                                frequency, a positive real <replaceable>f</replaceable>, in Hz.
+                                Most systems can cope with values up to 25-50 without
                                 creating too much overhead.</para></listitem>
                         </varlistentry>
 
@@ -128,36 +165,36 @@
                                 <term><option>--rel</option></term>
                                 <listitem><para>Use relative times instead of absolute
                                 times. This is useful for using bootchart at post-boot
-                                time to profile an already booted system, otherwise the
-                                graph would become extremely large. If set, the
+                                time to profile an already booted system. Without this
+                                option the graph would become extremely large. If set, the
                                 horizontal axis starts at the first recorded sample
-                                instead of time=0.0.</para></listitem>
+                                instead of time 0.0.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
                                 <term><option>-F</option></term>
                                 <term><option>--filter</option></term>
-                                <listitem><para>Disable filtering of tasks tasks that
+                                <listitem><para>Disable filtering of tasks that
                                 did not contribute significantly to the boot. Processes
                                 that are too short-lived (only seen in one sample) or
                                 that do not consume any significant CPU time (less than
-                                0.001sec) will not be displayed in the output graph.
+                                0.001 s) will not be displayed in the output graph.
                                 </para></listitem>
                         </varlistentry>
 
                         <varlistentry>
                                 <term><option>-o</option></term>
-                                <term><option>--output [path]</option></term>
-                                <listitem><para>Configures the output folder for writing
-                                the graphs. By default, bootchart writes the graphs to
+                                <term><option>--output <replaceable>path</replaceable></option></term>
+                                <listitem><para>Specify the output folder for the
+                                graphs. By default, bootchart writes the graphs to
                                 <filename>/run/log</filename>.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
                                 <term><option>-i</option></term>
-                                <term><option>--init [path]</option></term>
-                                <listitem><para>Set init binary to run. Defaults to
-                                <filename>/sbin/init</filename>.
+                                <term><option>--init <replaceable>path</replaceable></option></term>
+                                <listitem><para>Use this init binary. Defaults to
+                                <command>/sbin/init</command>.
                                 </para></listitem>
                         </varlistentry>
 
@@ -165,7 +202,11 @@
                                 <term><option>-p</option></term>
                                 <term><option>--pss</option></term>
                                 <listitem><para>Enable logging and graphing
-                                of processes PSS memory consumption.</para></listitem>
+                                of processes' PSS (Proportional Set Size)
+                                memory consumption. See <filename>filesystems/proc.txt</filename>
+                                in the kernel documentation for an
+                                explanation of this field.
+                                </para></listitem>
                         </varlistentry>
 
                         <varlistentry>
@@ -177,14 +218,14 @@
 
                         <varlistentry>
                                 <term><option>-x</option></term>
-                                <term><option>--scale-x N</option></term>
+                                <term><option>--scale-x <replaceable>N</replaceable></option></term>
                                 <listitem><para>Horizontal scaling factor for all variable
                                 graph components.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
                                 <term><option>-y</option></term>
-                                <term><option>--scale-y N</option></term>
+                                <term><option>--scale-y <replaceable>N</replaceable></option></term>
                                 <listitem><para>Vertical scaling factor for all variable
                                 graph components.</para></listitem>
                         </varlistentry>
@@ -197,19 +238,20 @@
         <refsect1>
                 <title>Output</title>
 
-                <para>systemd-bootchart generates SVG graphs. In order to render these
+                <para><command>systemd-bootchart</command> generates SVG graphs. In order to render those
                 on a graphical display any SVG capable viewer can be used. It should be
                 noted that the SVG render engines in most browsers (including Chrome
                 and Firefox) are many times faster than dedicated graphical applications
-                like Gimp and Inkscape.  Just point your browser at "file:///run/log"!
+                like Gimp and Inkscape.  Just point your browser at <ulink url="file:///run/log/" />!
                 </para>
         </refsect1>
 
         <refsect1>
                 <title>History</title>
 
-                <para>This version of bootchart was implemented from scratch, but inspired
-                  by former bootchart incantations:</para>
+                <para>This version of bootchart was implemented from
+                scratch, but is inspired by former bootchart
+                incantations:</para>
 
                 <variablelist>
                         <varlistentry>
@@ -247,7 +289,6 @@
                 has been collected. Also, the data kept in memory is reduced to the absolute
                 minimum needed.</para>
 
-
         </refsect1>
 
         <refsect1>
@@ -259,11 +300,10 @@
 
         <refsect1>
                 <title>Bugs</title>
-                <para>For bugs, please contact the author or current maintainer:</para>
-                <varlistentry>
-                        <term>Auke Kok</term>
-                        <term><emphasis>auke-jan.h.kok at intel.com</emphasis></term>
-                </varlistentry>
+                <para>For bugs, please contact the author and current maintainer:</para>
+                <simplelist>
+                        <member>Auke Kok <email>auke-jan.h.kok at intel.com</email></member>
+                </simplelist>
         </refsect1>
 
 </refentry>
diff --git a/src/bootchart/README b/src/bootchart/README
deleted file mode 100644
index 03b0fe9..0000000
--- a/src/bootchart/README
+++ /dev/null
@@ -1,83 +0,0 @@
-
-Bootchart - a 'startup' graphing tool
-
---
-
-Bootchart is a tool, usually run at system startup, that collects and graphs
-the CPU and disk load of the system as it works. The output of bootchart is
-an SVG graph. Normally, bootchart is invoked as `bootchartd` by the kernel
-by passing "init=/sbin/bootchartd" to the kernel. Bootchart will then fork
-init off to resume normal system startup, while monitoring and logging
-startup information in the background.
-
-After collecting a certain amount of data (usually 15-30 seconds) the logging
-stops and a graph is generated from the logged information. This graph
-contains vital clues to which resources are being used, in which order, and
-where possible problems exist in the startup sequence of the system.
-
-Of course, bootchart can also be used at any moment in time to collect and
-graph some data for an amount of time. Bootchart does not even require root
-privileges to do so, and will happily run as a normal user. Bootchart graphs
-are by default written time-stamped in /run/log.
-
---
-
-This version of bootchart was implemented from scratch and inspired by former
-incantations of bootchart:
-
-- The original bash/shell code implemented bootchart. This version logged all
-data into a compressed tarball for later processing, and did not create a graph
-on it's own.
-
-- The C-code implementation found in Ubuntu. This version replaced above shell
-code version with a faster and efficient data logger, but still did not graph
-code itself.
-
-- the original Java-based bootchart, the original graphing program that created
-a bootchart graph from logged data.
-
-- the pybootchartgui.py program, which created a graph based on the data logged
-by either standalone data logger.
-
-The version you are looking at combines these 2 parts into a single program,
-which makes running it and creating graphs a bit more efficient and simple.
-You can now run a single program at startup instead of 2. There are no timing
-problems (the graphing stage will never run if the logging stage didn't
-finish). The logged data isn't being written to disc first, then read again.
-Also, the data kept in memory is reduced to the absolute minimum needed to
-keep memory use low.
-
---
-
-Requirements: glibc. Your kernel must have procfs support and several
-proc output options enabled:
-  CONFIG_PROC_FS
-  CONFIG_SCHEDSTATS
-  CONFIG_SCHED_DEBUG
-at a minimum. bootchartd itself does not require any graphics library
-to generate the SVG output file.
-
---
-
-Configuration: please see bootchartd --help, as well as /etc/bootchartd.conf
-and/or /usr/share/doc/bootchart/bootchartd.conf.example for a list of
-configurable options.
-
---
-
-Many thanks to those who contributed ideas and code:
- - Ziga Mahkovec - Original bootchart author
- - Anders Norgaard - PyBootchartgui
- - Michael Meeks - bootchart2
- - Scott James Remnant - Ubuntu C-based logger
- - Arjan van der Ven - for the idea to merge bootgraph.pl functionality
-
---
-
-For bugs, please contact the author or current maintainer:
-Auke Kok <auke-jan.h.kok at intel.com>
-
---
-
-Download bootchart releases here: http://foo-projects.org/~sofar/bootchart/
-Source code is hosted here: git://github.com/sofar/bootchart
diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c
index 0c4d3e3..0176327 100644
--- a/src/bootchart/bootchart.c
+++ b/src/bootchart/bootchart.c
@@ -20,6 +20,17 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
 
+/***
+
+  Many thanks to those who contributed ideas and code:
+  - Ziga Mahkovec - Original bootchart author
+  - Anders Norgaard - PyBootchartgui
+  - Michael Meeks - bootchart2
+  - Scott James Remnant - Ubuntu C-based logger
+  - Arjan van der Ven - for the idea to merge bootgraph.pl functionality
+
+ ***/
+
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/resource.h>

commit d0a5cdb280f904eafacb09bbc391afd03c207b62
Author: Jan Janssen <medhefgo at web.de>
Date:   Fri Feb 15 16:10:36 2013 +0100

    systemctl: Don't give re-activation warning if unit is masked

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index becd68f..ddf46b6 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -1336,7 +1336,9 @@ static void check_triggering_units(
         _cleanup_dbus_message_unref_ DBusMessage *reply = NULL;
         DBusMessageIter iter, sub;
         const char *interface = "org.freedesktop.systemd1.Unit",
-                   *triggered_by_property = "TriggeredBy";
+                   *load_state_property = "LoadState",
+                   *triggered_by_property = "TriggeredBy",
+                   *state;
         char _cleanup_free_ *unit_path = NULL, *n = NULL;
         bool print_warning_label = true;
         int r;
@@ -1362,6 +1364,41 @@ static void check_triggering_units(
                         &reply,
                         NULL,
                         DBUS_TYPE_STRING, &interface,
+                        DBUS_TYPE_STRING, &load_state_property,
+                        DBUS_TYPE_INVALID);
+        if (r < 0)
+                return;
+
+        if (!dbus_message_iter_init(reply, &iter) ||
+            dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_VARIANT) {
+                log_error("Failed to parse reply.");
+                return;
+        }
+
+        dbus_message_iter_recurse(&iter, &sub);
+
+        if (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_STRING)  {
+            log_error("Failed to parse reply.");
+            return;
+        }
+
+        dbus_message_iter_get_basic(&sub, &state);
+
+        if (streq(state, "masked"))
+            return;
+
+        dbus_message_unref(reply);
+        reply = NULL;
+
+        r = bus_method_call_with_reply(
+                        bus,
+                        "org.freedesktop.systemd1",
+                        unit_path,
+                        "org.freedesktop.DBus.Properties",
+                        "Get",
+                        &reply,
+                        NULL,
+                        DBUS_TYPE_STRING, &interface,
                         DBUS_TYPE_STRING, &triggered_by_property,
                         DBUS_TYPE_INVALID);
         if (r < 0)

commit 265a7a2a604a9cf92e8aa167ed48afb78e6602ea
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Thu Feb 14 16:55:24 2013 -0500

    systemctl: allow status with no units
    
    This makes 'status' behave like 'list-units':
    systemctl status -> status of all units
    systemctl -t error status -> status of error units
    systemctl -t mount status -> etc.

diff --git a/man/systemctl.xml b/man/systemctl.xml
index 7f70642..760115a 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -471,7 +471,10 @@
                         <varlistentry>
                                 <term><command>list-units</command></term>
 
-                                <listitem><para>List known units.</para></listitem>
+                                <listitem><para>List known units (subject to limitations
+                                specified with <option>-t</option>).</para>
+
+                                <para>This is the default command.</para></listitem>
                         </varlistentry>
                         <varlistentry>
                                 <term><command>start [NAME...]</command></term>
@@ -619,15 +622,19 @@
 
                                 <listitem><para>Show terse runtime
                                 status information about one or more
-                                units, followed by its most recent log
-                                data from the journal. This function
-                                is intended to generate human-readable
-                                output. If you are looking for
-                                computer-parsable output, use
-                                <command>show</command> instead. If a
-                                PID is passed information about the
-                                unit the process of the PID belongs to
-                                is shown.</para></listitem>
+                                units, followed by most recent log
+                                data from the journal. If no units are
+                                specified, show all units (subject to
+                                limitations specified with
+                                <option>-t</option>). If a PID is
+                                passed show information about the unit
+                                the process belongs to.</para>
+
+                                <para>This function is intended to
+                                generate human-readable output. If you
+                                are looking for computer-parsable
+                                output, use <command>show</command>
+                                instead.</para></listitem>
                         </varlistentry>
                         <varlistentry>
                                 <term><command>show [NAME...|JOB...]</command></term>
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 4c91a18..becd68f 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -426,14 +426,15 @@ static void output_units_list(const struct unit_info *unit_infos, unsigned c) {
         }
 }
 
-static int list_units(DBusConnection *bus, char **args) {
-        _cleanup_dbus_message_unref_ DBusMessage *reply = NULL;
-        _cleanup_free_ struct unit_info *unit_infos = NULL;
+static int get_unit_list(DBusConnection *bus, DBusMessage **reply,
+                         struct unit_info **unit_infos, unsigned *c) {
         DBusMessageIter iter, sub;
-        unsigned c = 0, n_units = 0;
+        unsigned n_units = 0;
         int r;
 
-        pager_open_if_enabled();
+        assert(bus);
+        assert(unit_infos);
+        assert(c);
 
         r = bus_method_call_with_reply(
                         bus,
@@ -441,13 +442,13 @@ static int list_units(DBusConnection *bus, char **args) {
                         "/org/freedesktop/systemd1",
                         "org.freedesktop.systemd1.Manager",
                         "ListUnits",
-                        &reply,
+                        reply,
                         NULL,
                         DBUS_TYPE_INVALID);
         if (r < 0)
                 return r;
 
-        if (!dbus_message_iter_init(reply, &iter) ||
+        if (!dbus_message_iter_init(*reply, &iter) ||
             dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_ARRAY ||
             dbus_message_iter_get_element_type(&iter) != DBUS_TYPE_STRUCT)  {
                 log_error("Failed to parse reply.");
@@ -459,29 +460,45 @@ static int list_units(DBusConnection *bus, char **args) {
         while (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_INVALID) {
                 struct unit_info *u;
 
-                if (c >= n_units) {
+                if (*c >= n_units) {
                         struct unit_info *w;
 
-                        n_units = MAX(2*c, 16);
-                        w = realloc(unit_infos, sizeof(struct unit_info) * n_units);
+                        n_units = MAX(2 * *c, 16);
+                        w = realloc(*unit_infos, sizeof(struct unit_info) * n_units);
                         if (!w)
                                 return log_oom();
 
-                        unit_infos = w;
+                        *unit_infos = w;
                 }
 
-                u = unit_infos + c;
+                u = *unit_infos + *c;
 
                 bus_parse_unit_info(&sub, u);
 
                 dbus_message_iter_next(&sub);
-                c++;
+                (*c)++;
         }
 
-        if (c > 0) {
-                qsort(unit_infos, c, sizeof(struct unit_info), compare_unit_info);
+        if (*c > 0)
+                qsort(*unit_infos, *c, sizeof(struct unit_info), compare_unit_info);
+
+        return 0;
+}
+
+static int list_units(DBusConnection *bus, char **args) {
+        _cleanup_dbus_message_unref_ DBusMessage *reply = NULL;
+        _cleanup_free_ struct unit_info *unit_infos = NULL;
+        unsigned c = 0;
+        int r;
+
+        pager_open_if_enabled();
+
+        r = get_unit_list(bus, &reply, &unit_infos, &c);
+        if (r < 0)
+                return r;
+
+        if (c > 0)
                 output_units_list(unit_infos, c);
-        }
 
         return 0;
 }
@@ -3106,15 +3123,47 @@ static int show_one_by_pid(const char *verb, DBusConnection *bus, uint32_t pid,
         return r;
 }
 
+static int show_all(const char* verb, DBusConnection *bus, bool show_properties, bool *new_line) {
+        _cleanup_dbus_message_unref_ DBusMessage *reply = NULL;
+        _cleanup_free_ struct unit_info *unit_infos = NULL;
+        unsigned c = 0;
+        const struct unit_info *u;
+        int r;
+
+        r = get_unit_list(bus, &reply, &unit_infos, &c);
+        if (r < 0)
+                return r;
+
+        for (u = unit_infos; u < unit_infos + c; u++) {
+                char _cleanup_free_ *p = NULL;
+
+                if (!output_show_unit(u))
+                        continue;
+
+                p = unit_dbus_path_from_name(u->id);
+                if (!p)
+                        return log_oom();
+
+                printf("%s -> '%s'\n", u->id, p);
+
+                r = show_one(verb, bus, p, show_properties, new_line);
+                if (r != 0)
+                        return r;
+        }
+
+        return 0;
+}
+
 static int show(DBusConnection *bus, char **args) {
         int r, ret = 0;
-        bool show_properties, new_line = false;
+        bool show_properties, show_status, new_line = false;
         char **name;
 
         assert(bus);
         assert(args);
 
         show_properties = streq(args[0], "show");
+        show_status = streq(args[0], "status");
 
         if (show_properties)
                 pager_open_if_enabled();
@@ -3124,6 +3173,9 @@ static int show(DBusConnection *bus, char **args) {
         if (show_properties && strv_length(args) <= 1)
                 return show_one(args[0], bus, "/org/freedesktop/systemd1", show_properties, &new_line);
 
+        if (show_status && strv_length(args) <= 1)
+                return show_all(args[0], bus, false, &new_line);
+
         STRV_FOREACH(name, args+1) {
                 uint32_t id;
 
@@ -5049,7 +5101,7 @@ static int systemctl_main(DBusConnection *bus, int argc, char *argv[], DBusError
                 { "check",                 MORE,  2, check_unit_active },
                 { "is-failed",             MORE,  2, check_unit_failed },
                 { "show",                  MORE,  1, show              },
-                { "status",                MORE,  2, show              },
+                { "status",                MORE,  1, show              },
                 { "help",                  MORE,  2, show              },
                 { "dump",                  EQUAL, 1, dump              },
                 { "snapshot",              LESS,  2, snapshot          },



More information about the systemd-commits mailing list