diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-08-06 02:23:45 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-08-06 02:23:45 +0200 |
| commit | 75d287d3aef51baac189395d0ca6e2271ba4d604 (patch) | |
| tree | 01d311e2b69ffeb00d964c4172728ff8191491ec | |
| parent | 8519e861a8244eda106be87cc4b6e09804efdc1e (diff) | |
automount: order automount units after fsck, too
| -rw-r--r-- | fixme | 10 | ||||
| -rw-r--r-- | src/automount.c | 2 | ||||
| -rw-r--r-- | src/mount.c | 8 |
3 files changed, 9 insertions, 11 deletions
@@ -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 3a69cf9b4c..57d1065049 100644 --- 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 76e4aa9bb2..ba85d8c0a4 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_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; |