automount: order automount units after fsck, too

diff --git a/fixme b/fixme
index 3e12f3b316e47f789c3acc5bac283fc6ddf88370..f459f82996c59a6ef4afcb158539613b5c30ff92 100644 (file)
--- a/fixme
+++ b/fixme
@@ -61,19 +61,17 @@
 
 * if a service fails too often, make the service enter maintainence mode, and the socket, too.
 
-* systemctl reboot von getty tty1 hängt
-
 * keine meldung by wants vs. conflicts
 
 * send cgroup msg directly
 
-External:
+* fix graphical vs getty@tty1 output
 
-* default.target must be %ghosted...
+External:
 
-* in %post create all symlinks manually and use inittab data
+* agetty should not modify baudrate
 
-* default logic for serial getty, ck logging, ssh readahead
+* ck logging, ssh readahead
 
 * pam: fix double sudo session cleanup:
   http://www.gratisoft.us/bugzilla/show_bug.cgi?id=421

diff --git a/src/automount.c b/src/automount.c
index 3a69cf9b4c873b9074a6ecab3351028b4a81455a..57d1065049880e1723fb0a580ddae024e94e8835 100644 (file)
--- a/src/automount.c
+++ b/src/automount.c
@@ -153,7 +153,7 @@ static int automount_add_default_dependencies(Automount *a) {
 
         if (a->meta.manager->running_as == MANAGER_SYSTEM) {
 
-                if ((r = unit_add_dependency_by_name(UNIT(a), UNIT_AFTER, SPECIAL_SYSINIT_TARGET, NULL, true)) < 0)
+                if ((r = unit_add_dependency_by_name(UNIT(a), UNIT_AFTER, SPECIAL_FSCK_TARGET, NULL, true)) < 0)
                         return r;
 
                 if ((r = unit_add_two_dependencies_by_name(UNIT(a), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)

diff --git a/src/mount.c b/src/mount.c
index 76e4aa9bb2f783fb06bae8ae712f59fbeac4fa10..ba85d8c0a42d2d4f26b732fe9113295000e455a9 100644 (file)
--- 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_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;