mirror of
https://github.com/systemd/systemd.git
synced 2024-12-23 21:35:11 +03:00
mount: order remote mounts after both network.target and remote-fs-pre.target
Since remote-fs-pre.target is optional we cannot count on it to order remote mounts after network.target, so let's add that order explicitly in addition to remote-fs-pre.target. https://bugzilla.redhat.com/show_bug.cgi?id=749940
This commit is contained in:
parent
6ddaf1ca4a
commit
7fc2a89a73
@ -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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user