X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.special.xml;h=67a81b639b8d115df3700324f969c3bb550f05ee;hp=9ea288e337a0525728298ed40819d98c9fc4d3f2;hb=b9bf7e2be93fe25e0e96e06ad436d43a1e589ed5;hpb=f848f8d87e3aafa514e8134e3ecf2317d89420e0

diff --git a/man/systemd.special.xml b/man/systemd.special.xml
index 9ea288e33..67a81b639 100644
--- a/man/systemd.special.xml
+++ b/man/systemd.special.xml
@@ -64,11 +64,11 @@
                 <filename>halt.target</filename>,
                 <filename>hibernate.target</filename>,
                 <filename>hybrid-sleep.target</filename>,
+                <filename>initrd-fs.target</filename>,
                 <filename>kbrequest.target</filename>,
                 <filename>kexec.target</filename>,
                 <filename>local-fs.target</filename>,
                 <filename>local-fs-pre.target</filename>,
-                <filename>mail-transfer-agent.target</filename>,
                 <filename>multi-user.target</filename>,
                 <filename>network.target</filename>,
                 <filename>nss-lookup.target</filename>,
@@ -79,6 +79,7 @@
                 <filename>remote-fs.target</filename>,
                 <filename>remote-fs-pre.target</filename>,
                 <filename>rescue.target</filename>,
+                <filename>initrd-root-fs.target</filename>,
                 <filename>rpcbind.target</filename>,
                 <filename>runlevel2.target</filename>,
                 <filename>runlevel3.target</filename>,
@@ -94,7 +95,6 @@
                 <filename>swap.target</filename>,
                 <filename>sysinit.target</filename>,
                 <filename>syslog.socket</filename>,
-                <filename>syslog.target</filename>,
                 <filename>system-update.target</filename>,
                 <filename>time-sync.target</filename>,
                 <filename>umount.target</filename></para>
@@ -214,14 +214,6 @@
                                         <filename>gdm.service</filename>
                                         or a similar display manager
                                         service.</para>
-                                        <para>systemd automatically
-                                        adds dependencies of type
-                                        After for this target unit to
-                                        all SysV init script service
-                                        units with a LSB header
-                                        referring to the
-                                        <literal>$x-display-manager</literal>
-                                        facility.</para>
                                 </listitem>
                         </varlistentry>
                         <varlistentry>
@@ -305,6 +297,22 @@
                                         this unit.</para>
                                 </listitem>
                         </varlistentry>
+                        <varlistentry>
+                                <term><filename>initrd-fs.target</filename></term>
+                                <listitem>
+                                        <para>systemd automatically
+                                        adds dependencies of type
+                                        Before to sysroot-usr.mount and
+                                        all mount points fround in
+                                        <filename>/etc/fstab</filename>
+                                        that have the
+                                        <option>auto</option> and
+                                        <option>x-initrd.mount</option>
+                                        mount options set.
+                                        See also <literal>systemd-fstab-generator</literal>.
+                                        </para>
+                                </listitem>
+                        </varlistentry>
                         <varlistentry>
                                 <term><filename>kbrequest.target</filename></term>
                                 <listitem>
@@ -344,15 +352,6 @@
                                         <option>auto</option> and
                                         <option>comment=systemd.mount</option>
                                         mount options set.</para>
-
-                                        <para>systemd automatically
-                                        adds dependencies of type
-                                        After for this target unit to
-                                        all SysV init script service
-                                        units with an LSB header
-                                        referring to the
-                                        <literal>$local_fs</literal>
-                                        facility.</para>
                                 </listitem>
                         </varlistentry>
                         <varlistentry>
@@ -367,25 +366,6 @@
                                         all local mounts.</para>
                                 </listitem>
                         </varlistentry>
-                        <varlistentry>
-                                <term><filename>mail-transfer-agent.target</filename></term>
-                                <listitem>
-                                        <para>The mail transfer agent
-                                        (MTA) service. Usually this
-                                        should pull-in all units
-                                        necessary for
-                                        sending/receiving mails on the
-                                        local host.</para>
-
-                                        <para>systemd automatically
-                                        adds dependencies of type
-                                        After for this target unit to
-                                        all SysV init script service
-                                        units with an LSB header
-                                        referring to the
-                                        <literal>$mail-transfer-agent</literal>.</para>
-                                </listitem>
-                        </varlistentry>
                         <varlistentry>
                                 <term><filename>multi-user.target</filename></term>
                                 <listitem>
@@ -413,6 +393,16 @@
                                         referring to the
                                         <literal>$network</literal>
                                         facility.</para>
+
+                                        <para>This unit is supposed to
+                                        indicate when the network is
+                                        "up", but it is only very
+                                        loosely defined what that is
+                                        supposed to mean. Also see <ulink
+                                        url="http://www.freedesktop.org/wiki/Software/systemd/NetworkTarget">Running
+                                        Services After the Network is
+                                        up</ulink> for more
+                                        information.</para>
                                 </listitem>
                         </varlistentry>
                         <varlistentry>
@@ -532,6 +522,17 @@
                                         unit, for compatibility with SysV.</para>
                                 </listitem>
                         </varlistentry>
+                        <varlistentry>
+                                <term><filename>initrd-root-fs.target</filename></term>
+                                <listitem>
+                                        <para>systemd automatically
+                                        adds dependencies of type
+                                        Before to the sysroot.mount unit,
+                                        which is generated from the kernel command
+                                        line by the <literal>systemd-fstab-generator</literal>.
+                                        </para>
+                                </listitem>
+                        </varlistentry>
                         <varlistentry>
                                 <term><filename>rpcbind.target</filename></term>
                                 <listitem>
@@ -669,16 +670,6 @@
                                 <listitem>
                                         <para>A special target unit
                                         covering early boot-up scripts.</para>
-                                        <para>systemd automatically
-                                        adds dependencies of the types
-                                        Wants and After for all
-                                        SysV service units configured
-                                        for runlevels that are not 0
-                                        to 6 to this target unit.
-                                        This covers the special
-                                        boot-up runlevels some
-                                        distributions have, such as S
-                                        or b.</para>
                                 </listitem>
                         </varlistentry>
                         <varlistentry>
@@ -697,19 +688,6 @@
                                         document.</para>
                                 </listitem>
                         </varlistentry>
-                        <varlistentry>
-                                <term><filename>syslog.target</filename></term>
-                                <listitem>
-                                        <para>systemd automatically
-                                        adds dependencies of type
-                                        After for this target unit to
-                                        all SysV init script service
-                                        units with an LSB header
-                                        referring to the
-                                        <literal>$syslog</literal>
-                                        facility.</para>
-                                </listitem>
-                        </varlistentry>
                         <varlistentry>
                                 <term><filename>system-update.target</filename></term>
                                 <listitem>
@@ -811,6 +789,7 @@
                           <citerefentry><refentrytitle>systemd.socket</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                           <citerefentry><refentrytitle>systemd.target</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                           <citerefentry><refentrytitle>bootup</refentrytitle><manvolnum>7</manvolnum></citerefentry>
+                          <citerefentry><refentrytitle>systemd-fstab-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>
                   </para>
         </refsect1>