From 10e099981a14b6f435552854d4c9d5eaaa65c4da Mon Sep 17 00:00:00 2001

From: Lennart Poettering <lennart@poettering.net>

Date: Tue, 1 Nov 2011 22:27:48 +0100

Subject: [PATCH] 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

(cherry picked from commit 7fc2a89a7387db1e5daa4892393c9e9536920c25)

---

 src/mount.c |    7 ++++++-

 1 files changed, 6 insertions(+), 1 deletions(-)

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;

-- 

1.7.7.5