X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fmount.c;h=cf2355a3337bbf946bdec943c598ac5701f26bb2;hb=41b02ec77e54871eaa593c50fb31809814f627a7;hp=c1a1d511414d56b25fd61af0e0c77bd8158d34f1;hpb=5632e3743db350a67478acc107d76cdf648a1f99;p=elogind.git

diff --git a/src/mount.c b/src/mount.c
index c1a1d5114..cf2355a33 100644
--- a/src/mount.c
+++ b/src/mount.c
@@ -279,14 +279,14 @@ static int mount_add_default_dependencies(Mount *m) {
 
         assert(m);
 
-        if (m->meta.manager->running_as == MANAGER_SYSTEM) {
+        if (m->meta.manager->running_as == MANAGER_SYSTEM &&
+            !path_equal(m->where, "/")) {
 
-                if ((r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, SPECIAL_SYSINIT_TARGET, NULL, true)) < 0)
+                if ((r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, SPECIAL_FSCK_TARGET, NULL, true)) < 0)
                         return r;
 
-                if (!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;
+                if ((r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_CONFLICTED_BY, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
+                        return r;
         }
 
         return 0;