anitazha / rpms / systemd

Forked from rpms/systemd 3 years ago
Clone

Blame SOURCES/0029-unit-use-weaker-dependencies-between-mount-and-devic.patch

1ff636
From 1c0e8e9ce84cd74a20a60b98ab3a39d75d05b45f Mon Sep 17 00:00:00 2001
1ff636
From: Lennart Poettering <lennart@poettering.net>
1ff636
Date: Wed, 25 Feb 2015 22:05:14 +0100
1ff636
Subject: [PATCH] unit: use weaker dependencies between mount and device units
1ff636
 in --user mode
1ff636
1ff636
When running in user mode unmounting of mount units when a device
1ff636
vanishes is unlikely to work, and even if it would work is already done
1ff636
by PID 1 anyway. HEnce, when creating implicit dependencies between
1ff636
mount units and their backing devices, created a Wants= type dependency
1ff636
in --user mode, but leave a BindsTo= dependency in --system mode.
1ff636
1ff636
(cherry picked from commit 5bd4b173605142c7be493aa4d958ebaef21f421d)
1ff636
---
1ff636
 src/core/unit.c | 2 +-
1ff636
 1 file changed, 1 insertion(+), 1 deletion(-)
1ff636
1ff636
diff --git a/src/core/unit.c b/src/core/unit.c
c62b8e
index ee8e607c27..9f1e55e2f1 100644
1ff636
--- a/src/core/unit.c
1ff636
+++ b/src/core/unit.c
1ff636
@@ -2845,7 +2845,7 @@ int unit_add_node_link(Unit *u, const char *what, bool wants) {
1ff636
         if (r < 0)
1ff636
                 return r;
1ff636
 
1ff636
-        r = unit_add_two_dependencies(u, UNIT_AFTER, UNIT_BINDS_TO, device, true);
1ff636
+        r = unit_add_two_dependencies(u, UNIT_AFTER, u->manager->running_as == SYSTEMD_SYSTEM ? UNIT_BINDS_TO : UNIT_WANTS, device, true);
1ff636
         if (r < 0)
1ff636
                 return r;
1ff636