[systemd-commits] 2 commits - man/systemd.special.xml src/core

[Lennart Poettering]

 man/systemd.special.xml |   46 +++++++++++++++++++++++-----------------------
 src/core/mount.c        |   10 +++++++++-
 2 files changed, 32 insertions(+), 24 deletions(-)

New commits:
commit a63a5c4687d192d89eea9715db2a56c810111de8
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Mar 27 02:51:33 2013 +0100

    units: automatically order all mount units after network.target
    
    Previously it was necessary to pull in remote-fs-pre.target to order the
    mount units against network.target since the ordering was done
    transitively via remote-fs-pre.target.
    
    As network implementations shouldn't need to know about the specific
    use-case of network mounts we instead now simply order network.target
    against all mounts too. This should make it unnecessary for network
    managing services to import remote-fs-pre.target explicitly, as
    network.target will now suffice.

diff --git a/src/core/mount.c b/src/core/mount.c
index c4074eb..3c63a39 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -441,7 +441,7 @@ static int mount_add_quota_links(Mount *m) {
 static int mount_add_default_dependencies(Mount *m) {
         int r;
         MountParameters *p;
-        const char *after, *setup;
+        const char *after, *after2, *setup;
 
         assert(m);
 
@@ -458,9 +458,11 @@ static int mount_add_default_dependencies(Mount *m) {
 
         if (mount_is_network(p)) {
                 after = SPECIAL_REMOTE_FS_PRE_TARGET;
+                after2 = SPECIAL_NETWORK_TARGET;
                 setup = SPECIAL_REMOTE_FS_SETUP_TARGET;
         } else {
                 after = SPECIAL_LOCAL_FS_PRE_TARGET;
+                after2 = NULL;
                 setup = NULL;
         }
 
@@ -468,6 +470,12 @@ static int mount_add_default_dependencies(Mount *m) {
         if (r < 0)
                 return r;
 
+        if (after2) {
+                r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, after2, NULL, true);
+                if (r < 0)
+                        return r;
+        }
+
         if (setup) {
                 r = unit_add_dependency_by_name(UNIT(m), UNIT_WANTS, setup, NULL, true);
                 if (r < 0)

commit 1183f9b2252d0ee45ec7ad32ba34be746ceaaf6e
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Mar 27 02:49:50 2013 +0100

    man: network.target is also a passive target

diff --git a/man/systemd.special.xml b/man/systemd.special.xml
index b7340ed..172836e 100644
--- a/man/systemd.special.xml
+++ b/man/systemd.special.xml
@@ -388,29 +388,6 @@
                                 </listitem>
                         </varlistentry>
                         <varlistentry>
-                                <term><filename>network.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>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>
                                 <term><filename>paths.target</filename></term>
                                 <listitem>
                                         <para>A special target unit
@@ -833,6 +810,29 @@
                                 </listitem>
                         </varlistentry>
                         <varlistentry>
+                                <term><filename>network.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>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>
                                 <term><filename>nss-lookup.target</filename></term>
                                 <listitem>
                                         <para>A target that should be