aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd/systemd/order-remote-mounts-from-mountinfo-before-remote-fs-target.patch
blob: feae4c681aa991f2312ad54abe9b809255d619cf (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
Upstream-Status: Backport

From 3cc758386909bf1ae2e3305ca6c6355e223bfc8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Thu, 3 Oct 2013 22:15:08 -0400
Subject: [PATCH] systemd: order remote mounts from mountinfo before
 remote-fs.target

Usually the network is stopped before filesystems are umounted.
Ordering network filesystems before remote-fs.target means that their
unmounting will be performed earlier, and can terminate sucessfully.

https://bugs.freedesktop.org/show_bug.cgi?id=70002
(cherry picked from commit 77009452cfd25208509b14ea985e81fdf9f7d40e)
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
 src/core/mount.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/core/mount.c b/src/core/mount.c
index c7d29b0..17c4cfc 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -1513,6 +1513,9 @@ static int mount_add_one(
 
         u = manager_get_unit(m, e);
         if (!u) {
+                const char* const target =
+                        fstype_is_network(fstype) ? SPECIAL_REMOTE_FS_TARGET : SPECIAL_LOCAL_FS_TARGET;
+
                 delete = true;
 
                 u = unit_new(m, sizeof(Mount));
@@ -1539,7 +1542,7 @@ static int mount_add_one(
                         goto fail;
                 }
 
-                r = unit_add_dependency_by_name(u, UNIT_BEFORE, SPECIAL_LOCAL_FS_TARGET, NULL, true);
+                r = unit_add_dependency_by_name(u, UNIT_BEFORE, target, NULL, true);
                 if (r < 0)
                         goto fail;
 
-- 
1.9.1