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