X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.special.xml;h=4588f5899901d2740f91c0f1a039eefb1118eef0;hp=b77b60d92048801f615593bae642ad71255cbaeb;hb=5e9dfd2ef99bad1000a6246a160c096c4dbd2158;hpb=e06e62f4a1d7a976587c4241eca157ce98d2da33

diff --git a/man/systemd.special.xml b/man/systemd.special.xml
index b77b60d92..4588f5899 100644
--- a/man/systemd.special.xml
+++ b/man/systemd.special.xml
@@ -71,6 +71,7 @@
                 <filename>local-fs-pre.target</filename>,
                 <filename>multi-user.target</filename>,
                 <filename>network.target</filename>,
+                <filename>network-online.target</filename>,
                 <filename>nss-lookup.target</filename>,
                 <filename>nss-user-lookup.target</filename>,
                 <filename>paths.target</filename>,
@@ -79,7 +80,6 @@
                 <filename>reboot.target</filename>,
                 <filename>remote-fs.target</filename>,
                 <filename>remote-fs-pre.target</filename>,
-                <filename>remote-fs-setup.target</filename>,
                 <filename>rescue.target</filename>,
                 <filename>initrd-root-fs.target</filename>,
                 <filename>rpcbind.target</filename>,
@@ -314,7 +314,7 @@
                                         dependencies of type
                                         <varname>Before=</varname> to
                                         <filename>sysroot-usr.mount</filename>
-                                        and all mount points fround in
+                                        and all mount points found in
                                         <filename>/etc/fstab</filename>
                                         that have the
                                         <option>auto</option> and
@@ -388,27 +388,65 @@
                                 </listitem>
                         </varlistentry>
                         <varlistentry>
-                                <term><filename>network.target</filename></term>
+                                <term><filename>network-online.target</filename></term>
                                 <listitem>
-                                        <para>systemd automatically
-                                        adds dependencies of type
-                                        <varname>After=</varname> for
-                                        this target unit to all SysV
-                                        init script service units with
-                                        an LSB header referring to the
-                                        <literal>$network</literal>
-                                        facility.</para>
+                                        <para>Units that strictly
+                                        require a configured network
+                                        connection should pull in
+                                        <filename>network-online.target</filename>
+                                        (via a
+                                        <varname>Wants=</varname> type
+                                        dependency) and order
+                                        themselves after it. This
+                                        target unit is intended to
+                                        pull in a service that delays
+                                        further execution until the
+                                        network is sufficiently set
+                                        up. What precisely this
+                                        requires is left to the
+                                        implementation of the network
+                                        managing service.</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
+                                        <para>Note the distinction
+                                        between this unit and
+                                        <filename>network.target</filename>. This
+                                        unit is an active unit
+                                        (i.e. pulled in by the
+                                        consumer rather than the
+                                        provider of this
+                                        functionality) and pulls in a
+                                        service which possibly adds
+                                        substantial delays to further
+                                        execution. In contrast,
+                                        <filename>network.target</filename>
+                                        is a passive unit (i.e. pulled
+                                        in by the provider of the
+                                        functionality, rather than the
+                                        consumer) that usually does
+                                        not delay execution
+                                        much. Usually,
+                                        <filename>network.target</filename>
+                                        is part of the boot of most
+                                        systems, while
+                                        <filename>network-online.target</filename>
+                                        is not, except when at least
+                                        one unit requires it. 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>
+
+                                        <para>All mount units for
+                                        remote network file systems
+                                        automatically pull in this
+                                        unit, and order themselves
+                                        after it. Note that networking
+                                        daemons that simply provide
+                                        functionality to other hosts
+                                        generally don't need to pull
+                                        this in.</para>
+                                        </listitem>
                         </varlistentry>
                         <varlistentry>
                                 <term><filename>paths.target</filename></term>
@@ -481,29 +519,6 @@
                                         facility.</para>
                                 </listitem>
                         </varlistentry>
-                        <varlistentry>
-                                <term><filename>remote-fs-setup.target</filename></term>
-                                <listitem>
-                                        <para>This target unit is
-                                        automatically pulled in (by a
-                                        <varname>Wants=</varname> type
-                                        dependency) by all remote
-                                        mount points. It can be used
-                                        to run certain units when at
-                                        least one remote file system
-                                        is to be mounted. Note that
-                                        this target is not ordered
-                                        against the remote mounts, use
-                                        <filename>remote-fs-pre.target</filename>
-                                        for that (see below).</para>
-
-                                        <para>Again, this target unit
-                                        is <emphasis>not</emphasis>
-                                        suitable for ordering, it is
-                                        only useful for pulling in
-                                        other units.</para>
-                                </listitem>
-                        </varlistentry>
                         <varlistentry>
                                 <term><filename>rescue.target</filename></term>
                                 <listitem>
@@ -769,7 +784,7 @@
                                         available at boot.</para>
 
                                         <para>This may be used to pull
-                                        in printer management
+                                        in smartcard management
                                         daemons dynamically when
                                         smartcard hardware is
                                         found.</para>
@@ -786,7 +801,7 @@
 
                                         <para>This may be used to pull
                                         in audio management daemons
-                                        dynamically when printer
+                                        dynamically when audio
                                         hardware is found.</para>
                                 </listitem>
                         </varlistentry>
@@ -811,6 +826,14 @@
                 (via a <varname>Wants=</varname> type
                 dependency).</para>
 
+                <para>Note that these passive units cannot be started
+                manually, i.e. <literal>systemctl start
+                time-sync.target</literal> will fail with an
+                error. They can only be pulled in by dependency. This
+                is enforced since they exist for ordering purposes
+                only and thus are not useful as only unit within a
+                transaction.</para>
+
                 <variablelist>
                         <varlistentry>
                                 <term><filename>local-fs-pre.target</filename></term>
@@ -824,6 +847,40 @@
                                         all local mounts.</para>
                                 </listitem>
                         </varlistentry>
+                        <varlistentry>
+                                <term><filename>network.target</filename></term>
+                                <listitem>
+                                        <para>This unit is supposed to
+                                        indicate when network
+                                        functionality is available,
+                                        but it is only very weakly
+                                        defined what that is supposed
+                                        to mean, with one exception:
+                                        at shutdown, a unit that is
+                                        ordered after
+                                        <filename>network.target</filename>
+                                        will be stopped before the
+                                        network -- to whatever level
+                                        it might be set up then -- is
+                                        shut down. Also see <ulink
+                                        url="http://www.freedesktop.org/wiki/Software/systemd/NetworkTarget">Running
+                                        Services After the Network is
+                                        up</ulink> for more
+                                        information. Also see
+                                        <filename>network-online.target</filename>
+                                        described above.</para>
+
+                                        <para>systemd automatically
+                                        adds dependencies of type
+                                        <varname>After=</varname> for
+                                        this target unit to all SysV
+                                        init script service units with
+                                        an LSB header referring to the
+                                        <literal>$network</literal>
+                                        facility.</para>
+
+                                </listitem>
+                        </varlistentry>
                         <varlistentry>
                                 <term><filename>nss-lookup.target</filename></term>
                                 <listitem>
@@ -880,7 +937,7 @@
                                         to be pulled in by the first
                                         remote mount showing up it
                                         should use
-                                        <filename>remote-fs-setup.target</filename>
+                                        <filename>network-online.target</filename>
                                         (see above).</para>
 
                                         <para>Again, this target unit