diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-12-11 14:06:38 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-11 14:06:38 +0100 |
commit | 433cfaf038165ba47851d66d20cb829f7a2bac69 (patch) | |
tree | abcfe178e6483bbc7751eb193047e82e683b2193 /src | |
parent | 74d99c3ffb92a29313b5eee09e2cba3938e12349 (diff) | |
parent | 195baa1bd82e2d0b3fe460d68404f09ec8d9de4b (diff) | |
download | systemd-433cfaf038165ba47851d66d20cb829f7a2bac69.tar.gz |
Merge pull request #20598 from tomty89/order_noauto
fstab-generator, core/mount: Avoid special fs target before dependency only if nofail is used
Diffstat (limited to 'src')
-rw-r--r-- | src/core/mount.c | 10 | ||||
-rw-r--r-- | src/fstab-generator/fstab-generator.c | 3 |
2 files changed, 2 insertions, 11 deletions
diff --git a/src/core/mount.c b/src/core/mount.c index fcff70d40b..0170406351 100644 --- a/src/core/mount.c +++ b/src/core/mount.c @@ -84,14 +84,6 @@ static MountParameters* get_mount_parameters(Mount *m) { return get_mount_parameters_fragment(m); } -static bool mount_is_automount(const MountParameters *p) { - assert(p); - - return fstab_test_option(p->options, - "comment=systemd.automount\0" - "x-systemd.automount\0"); -} - static bool mount_is_network(const MountParameters *p) { assert(p); @@ -484,7 +476,7 @@ static int mount_add_default_ordering_dependencies( before = SPECIAL_LOCAL_FS_TARGET; } - if (!mount_is_nofail(m) && !mount_is_automount(p)) { + if (!mount_is_nofail(m)) { r = unit_add_dependency_by_name(UNIT(m), UNIT_BEFORE, before, true, mask); if (r < 0) return r; diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c index b764bee215..f9a954a308 100644 --- a/src/fstab-generator/fstab-generator.c +++ b/src/fstab-generator/fstab-generator.c @@ -436,8 +436,7 @@ static int add_mount( /* Order the mount unit we generate relative to the post unit, so that DefaultDependencies= on the * target unit won't affect us. */ - if (post && !FLAGS_SET(flags, MOUNT_AUTOMOUNT) && !FLAGS_SET(flags, MOUNT_NOAUTO) && - !FLAGS_SET(flags, MOUNT_NOFAIL)) + if (post && !FLAGS_SET(flags, MOUNT_NOFAIL)) fprintf(f, "Before=%s\n", post); if (passno != 0) { |