mount: add implicit umount.target conflicts only in system mode

[elogind.git] / src / automount.c

diff --git a/src/automount.c b/src/automount.c
index 26fec45107b35ad0e95aa9f0714a86b3ed11d79f..934aa5f35d78dc83716a56433d0ff3d4e8e28838 100644 (file)
--- 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;
         }