X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=src%2Fmount.c;h=ba85d8c0a42d2d4f26b732fe9113295000e455a9;hb=75d287d3aef51baac189395d0ca6e2271ba4d604;hp=c1a1d511414d56b25fd61af0e0c77bd8158d34f1;hpb=5632e3743db350a67478acc107d76cdf648a1f99;p=elogind.git diff --git a/src/mount.c b/src/mount.c index c1a1d5114..ba85d8c0a 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_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0) + return r; } return 0;