[systemd-commits] 2 commits - src/mount.c units/remote-fs-pre.target

[Lennart Poettering]

 src/mount.c                |    7 ++++++-
 units/remote-fs-pre.target |    3 ---
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit fc8f0b5c9cb8277950a2fefdb7f754c47b172dfd
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Nov 1 22:29:48 2011 +0100

    units: drop [Install] section from remote-fs-pre.target
    
    remote-fs-pre.target is not a unit a user should ever explicitly enable.
    Instead services which need to hook before network mounts should pull it
    in.

diff --git a/units/remote-fs-pre.target b/units/remote-fs-pre.target
index 5406aa2..8aceb08 100644
--- a/units/remote-fs-pre.target
+++ b/units/remote-fs-pre.target
@@ -10,6 +10,3 @@
 [Unit]
 Description=Remote File Systems (Pre)
 After=network.target
-
-[Install]
-WantedBy=multi-user.target

commit 7fc2a89a7387db1e5daa4892393c9e9536920c25
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Nov 1 22:27:48 2011 +0100

    mount: order remote mounts after both network.target and remote-fs-pre.target
    
    Since remote-fs-pre.target is optional we cannot count on it to order
    remote mounts after network.target, so let's add that order explicitly
    in addition to remote-fs-pre.target.
    
    https://bugzilla.redhat.com/show_bug.cgi?id=749940

diff --git a/src/mount.c b/src/mount.c
index ef953f0..f9cfe91 100644
--- a/src/mount.c
+++ b/src/mount.c
@@ -327,7 +327,7 @@ static bool needs_quota(MountParameters *p) {
 }
 
 static int mount_add_fstab_links(Mount *m) {
-        const char *target, *after = NULL;
+        const char *target, *after = NULL, *after2 = NULL;
         MountParameters *p;
         Unit *tu;
         int r;
@@ -358,6 +358,7 @@ static int mount_add_fstab_links(Mount *m) {
         if (mount_is_network(p)) {
                 target = SPECIAL_REMOTE_FS_TARGET;
                 after = SPECIAL_REMOTE_FS_PRE_TARGET;
+                after2 = SPECIAL_NETWORK_TARGET;
         } else {
                 target = SPECIAL_LOCAL_FS_TARGET;
                 after = SPECIAL_LOCAL_FS_PRE_TARGET;
@@ -374,6 +375,10 @@ static int mount_add_fstab_links(Mount *m) {
                 if ((r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, after, NULL, true)) < 0)
                         return r;
 
+        if (after2)
+                if ((r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, after2, NULL, true)) < 0)
+                        return r;
+
         if (automount) {
                 Unit *am;