diff options
| author | Lennart Poettering <lennart@poettering.net> | 2011-11-08 19:44:16 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-11-08 19:44:16 +0100 |
| commit | 1e2579fdeb7608719cb28da0b5061f48ba0efc34 (patch) | |
| tree | 83352697294bd24015efdce199e8fbc3d2788f6e /src/mount.c | |
| parent | a40593a0d0d740efa387e35411e1e456a6c5aba7 (diff) | |
| parent | 4cbd9ecf45f64c3a9acc99d473fbf3be3687ae24 (diff) | |
Merge branch 'master' into journal
Diffstat (limited to 'src/mount.c')
| -rw-r--r-- | src/mount.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/mount.c b/src/mount.c index ef953f0d0a..f9cfe910a0 100644 --- a/src/mount.c +++ b/src/mount.c @@ -327,7 +327,7 @@ static bool needs_quota(MountParameters *p) { } static int mount_add_fstab_links(Mount *m) { - const char *target, *after = NULL; + const char *target, *after = NULL, *after2 = NULL; MountParameters *p; Unit *tu; int r; @@ -358,6 +358,7 @@ static int mount_add_fstab_links(Mount *m) { if (mount_is_network(p)) { target = SPECIAL_REMOTE_FS_TARGET; after = SPECIAL_REMOTE_FS_PRE_TARGET; + after2 = SPECIAL_NETWORK_TARGET; } else { target = SPECIAL_LOCAL_FS_TARGET; after = SPECIAL_LOCAL_FS_PRE_TARGET; @@ -374,6 +375,10 @@ static int mount_add_fstab_links(Mount *m) { if ((r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, after, NULL, true)) < 0) return r; + if (after2) + if ((r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, after2, NULL, true)) < 0) + return r; + if (automount) { Unit *am; |