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