nspawn: when resoliving UIDs/GIDs for "-u", do so in forked off /usr/bin/getent inste...

[elogind.git] / man / systemd.xml

diff --git a/man/systemd.xml b/man/systemd.xml
index 1e54eac9267825340e70d1aa8b1e58d1abbbc5ff..331e6c2ff6c4e770c905336ec04fd39e614a381c 100644 (file)
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -21,7 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 

-<refentry id="systemd">
+<refentry id="systemd"
+          xmlns:xi="http://www.w3.org/2001/XInclude">

 
         <refentryinfo>
                 <title>systemd</title>
 
         <refentryinfo>
                 <title>systemd</title>


@@ -88,19 +89,6 @@
                 <para>The following options are understood:</para>
 
                 <variablelist>
                 <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 systemd version
-                                identifier and exits.</para></listitem>
-                        </varlistentry>

                         <varlistentry>
                                 <term><option>--test</option></term>
 
                         <varlistentry>
                                 <term><option>--test</option></term>
 


@@ -118,25 +106,11 @@
                                 configuration items understood in unit
                                 definition files.</para></listitem>
                         </varlistentry>
                                 configuration items understood in unit
                                 definition files.</para></listitem>
                         </varlistentry>

-                        <varlistentry>
-                                <term><option>--introspect=</option></term>
-
-                                <listitem><para>Extract D-Bus
-                                interface introspection data. This is
-                                mostly useful at install time
-                                to generate data suitable for the
-                                D-Bus interfaces
-                                repository. Optionally the interface
-                                name for the introspection data may be
-                                specified. If omitted, the
-                                introspection data for all interfaces
-                                is dumped.</para></listitem>
-                        </varlistentry>

                         <varlistentry>
                                 <term><option>--unit=</option></term>
 
                                 <listitem><para>Set default unit to
                         <varlistentry>
                                 <term><option>--unit=</option></term>
 
                                 <listitem><para>Set default unit to

-                                activate on startup. If not specified
+                                activate on startup. If not specified,

                                 defaults to
                                 <filename>default.target</filename>.</para></listitem>
                         </varlistentry>
                                 defaults to
                                 <filename>default.target</filename>.</para></listitem>
                         </varlistentry>


@@ -233,7 +207,7 @@
 
                                 <listitem><para>Highlight important
                                 log messages. Argument is a boolean
 
                                 <listitem><para>Highlight important
                                 log messages. Argument is a boolean

-                                value. If the argument is omitted it
+                                value. If the argument is omitted, it

                                 defaults to
                                 <option>true</option>.</para></listitem>
                         </varlistentry>
                                 defaults to
                                 <option>true</option>.</para></listitem>
                         </varlistentry>


@@ -278,6 +252,9 @@
                                 to
                                 <option>inherit</option>.</para></listitem>
                         </varlistentry>
                                 to
                                 <option>inherit</option>.</para></listitem>
                         </varlistentry>

+
+                        <xi:include href="standard-options.xml" xpointer="help" />
+                        <xi:include href="standard-options.xml" xpointer="version" />

                 </variablelist>
         </refsect1>
 
                 </variablelist>
         </refsect1>
 


@@ -374,7 +351,7 @@
                         <listitem><para>Slice units may be used to
                         group units which manage system processes
                         (such as service and scope units) in a
                         <listitem><para>Slice units may be used to
                         group units which manage system processes
                         (such as service and scope units) in a

-                        hierachial tree for resource management
+                        hierarchical tree for resource management

                         purposes. See
                         <citerefentry><refentrytitle>systemd.slice</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para></listitem>
 
                         purposes. See
                         <citerefentry><refentrytitle>systemd.slice</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para></listitem>
 


@@ -407,7 +384,7 @@
                 and ordering dependencies are placed between two
                 units. Also note that the majority of dependencies are
                 implicitly created and maintained by systemd. In most
                 and ordering dependencies are placed between two
                 units. Also note that the majority of dependencies are
                 implicitly created and maintained by systemd. In most

-                cases it should be unnecessary to declare additional
+                cases, it should be unnecessary to declare additional

                 dependencies manually, however it is possible to do
                 this.</para>
 
                 dependencies manually, however it is possible to do
                 this.</para>
 


@@ -429,7 +406,7 @@
                 <filename>multi-user.target</filename> (for limited
                 console-only boots for use in embedded or server
                 environments, or similar; a subset of
                 <filename>multi-user.target</filename> (for limited
                 console-only boots for use in embedded or server
                 environments, or similar; a subset of

-                graphical.target). However it is at the discretion of
+                graphical.target). However, it is at the discretion of

                 the administrator to configure it as an alias to any
                 other target unit. See
                 <citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>7</manvolnum></citerefentry>
                 the administrator to configure it as an alias to any
                 other target unit. See
                 <citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>7</manvolnum></citerefentry>


@@ -494,7 +471,7 @@
                 <filename>/proc</filename>.</para>
 
                 <para>For more information about the concepts and
                 <filename>/proc</filename>.</para>
 
                 <para>For more information about the concepts and

-                ideas behind systemd please refer to the <ulink
+                ideas behind systemd, please refer to the <ulink

                 url="http://0pointer.de/blog/projects/systemd.html">Original
                 Design Document</ulink>.</para>
 
                 url="http://0pointer.de/blog/projects/systemd.html">Original
                 Design Document</ulink>.</para>
 


@@ -1022,7 +999,7 @@
                                 option prefixed with
                                 <literal>rd.</literal> is honored
                                 only in the initial RAM disk (initrd),
                                 option prefixed with
                                 <literal>rd.</literal> is honored
                                 only in the initial RAM disk (initrd),

-                                while the one that isn't prefixed only
+                                while the one that is not prefixed only

                                 in the main system.</para></listitem>
                         </varlistentry>
 
                                 in the main system.</para></listitem>
                         </varlistentry>
 


@@ -1030,9 +1007,9 @@
                                 <term><varname>systemd.dump_core=</varname></term>
 
                                 <listitem><para>Takes a boolean
                                 <term><varname>systemd.dump_core=</varname></term>
 
                                 <listitem><para>Takes a boolean

-                                argument. If <option>true</option>
+                                argument. If <option>true</option>,

                                 systemd dumps core when it
                                 systemd dumps core when it

-                                crashes. Otherwise no core dump is
+                                crashes. Otherwise, no core dump is

                                 created. Defaults to
                                 <option>true</option>.</para></listitem>
                         </varlistentry>
                                 created. Defaults to
                                 <option>true</option>.</para></listitem>
                         </varlistentry>


@@ -1041,9 +1018,9 @@
                                 <term><varname>systemd.crash_shell=</varname></term>
 
                                 <listitem><para>Takes a boolean
                                 <term><varname>systemd.crash_shell=</varname></term>
 
                                 <listitem><para>Takes a boolean

-                                argument. If <option>true</option>
+                                argument. If <option>true</option>,

                                 systemd spawns a shell when it
                                 systemd spawns a shell when it

-                                crashes. Otherwise no shell is
+                                crashes. Otherwise, no shell is

                                 spawned. Defaults to
                                 <option>false</option>, for security
                                 reasons, as the shell is not protected
                                 spawned. Defaults to
                                 <option>false</option>, for security
                                 reasons, as the shell is not protected


@@ -1065,7 +1042,7 @@
                                 <term><varname>systemd.confirm_spawn=</varname></term>
 
                                 <listitem><para>Takes a boolean
                                 <term><varname>systemd.confirm_spawn=</varname></term>
 
                                 <listitem><para>Takes a boolean

-                                argument. If <option>true</option>
+                                argument. If <option>true</option>,

                                 asks for confirmation when spawning
                                 processes. Defaults to
                                 <option>false</option>.</para></listitem>
                                 asks for confirmation when spawning
                                 processes. Defaults to
                                 <option>false</option>.</para></listitem>


@@ -1075,14 +1052,20 @@
                                 <term><varname>systemd.show_status=</varname></term>
 
                                 <listitem><para>Takes a boolean
                                 <term><varname>systemd.show_status=</varname></term>
 
                                 <listitem><para>Takes a boolean

-                                argument. If <option>true</option>
-                                shows terse service status updates on
-                                the console during bootup. Defaults to
+                                argument or the constant
+                                <constant>auto</constant>. If
+                                <option>true</option>, shows terse
+                                service status updates on the console
+                                during bootup.
+                                <constant>auto</constant> behaves like
+                                <option>false</option> until a service
+                                fails or there is a significant delay
+                                in boot. Defaults to

                                 <option>true</option>, unless
                                 <option>quiet</option> is passed as
                                 kernel command line option in which
                                 case it defaults to
                                 <option>true</option>, unless
                                 <option>quiet</option> is passed as
                                 kernel command line option in which
                                 case it defaults to

-                                <option>false</option>.</para></listitem>
+                                <constant>auto</constant>.</para></listitem>

                         </varlistentry>
 
                         <varlistentry>
                         </varlistentry>
 
                         <varlistentry>


@@ -1113,16 +1096,11 @@
                                 <term><varname>systemd.setenv=</varname></term>
 
                                 <listitem><para>Takes a string
                                 <term><varname>systemd.setenv=</varname></term>
 
                                 <listitem><para>Takes a string

-                                argument in the form
-                                VARIABLE=VALUE. May be used to set
-                                environment variables for the init
-                                process and all its children at boot
-                                time. May be used more than once to
-                                set multiple variables. If the equal
-                                sign and variable are missing it unsets
-                                an environment variable which might be
-                                passed in from the initial ram
-                                disk.</para></listitem>
+                                argument in the form VARIABLE=VALUE.
+                                May be used to set default environment
+                                variables to add to forked child processes.
+                                May be used more than once to set multiple
+                                variables.</para></listitem>

                         </varlistentry>
 
                         <varlistentry>
                         </varlistentry>
 
                         <varlistentry>


@@ -1154,6 +1132,7 @@
                         </varlistentry>
 
                         <varlistentry>
                         </varlistentry>
 
                         <varlistentry>

+                                <term><varname>-b</varname></term>

                                 <term><varname>emergency</varname></term>
 
                                 <listitem><para>Boot into emergency
                                 <term><varname>emergency</varname></term>
 
                                 <listitem><para>Boot into emergency


@@ -1285,6 +1264,7 @@
         <refsect1>
                 <title>See Also</title>
                 <para>
         <refsect1>
                 <title>See Also</title>
                 <para>

+                        The <ulink url="http://www.freedesktop.org/wiki/Software/systemd/">systemd Homepage</ulink>,

                         <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>locale.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>locale.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,