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

[elogind.git] / src / mount.c

diff --git a/src/mount.c b/src/mount.c
index 498732eef18d5c49b38d23600a21d4627676f79c..36caae3c812d7ee6299a743072449be926872b0b 100644 (file)
--- a/src/mount.c
+++ b/src/mount.c
@@ -367,6 +367,12 @@ static int mount_load(Unit *u) {
 
                 if ((r = unit_add_default_cgroup(u)) < 0)
                         return r;
+
+                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;
         }
 
         return mount_verify(m);