summaryrefslogtreecommitdiff
path: root/src/automount.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-07-10 04:46:58 +0200
committerLennart Poettering <lennart@poettering.net>2010-07-10 04:46:58 +0200
commit73c33e7f225f81e6066386fba997e8ea2ba361b3 (patch)
tree1be264f92b35c211bb966d1167a230e8f91741f8 /src/automount.c
parent5682009b2153badf0c3d07baf574ef1b1547a5c5 (diff)
mount: add implicit umount.target conflicts only in system mode
Diffstat (limited to 'src/automount.c')
-rw-r--r--src/automount.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/automount.c b/src/automount.c
index 26fec45107..934aa5f35d 100644
--- a/src/automount.c
+++ b/src/automount.c
@@ -201,7 +201,8 @@ static int automount_load(Unit *u) {
if ((r = unit_add_dependency(u, UNIT_BEFORE, UNIT(a->mount), true)) < 0)
return r;
- if (a->meta.default_dependencies)
+ if (a->meta.default_dependencies &&
+ a->meta.manager->running_as == MANAGER_SYSTEM)
if ((r = unit_add_two_dependencies_by_name(UNIT(a), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
return r;
}