summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/automount.c3
-rw-r--r--src/mount.c4
2 files changed, 5 insertions, 2 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;
}
diff --git a/src/mount.c b/src/mount.c
index 57c258f9f2..36caae3c81 100644
--- a/src/mount.c
+++ b/src/mount.c
@@ -368,7 +368,9 @@ static int mount_load(Unit *u) {
if ((r = unit_add_default_cgroup(u)) < 0)
return r;
- if (m->meta.default_dependencies && !path_equal(m->where, "/"))
+ if (m->meta.default_dependencies &&
+ m->meta.manager->running_as == MANAGER_SYSTEM &&
+ !path_equal(m->where, "/"))
if ((r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
return r;
}