diff options
| author | Lennart Poettering <lennart@poettering.net> | 2022-01-31 19:00:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-31 19:00:57 +0100 |
| commit | 5bb27062bc67c0d921ea7ffc0807e2885e599312 (patch) | |
| tree | d3d38028f8a5a738c7e7e93833001b31ce69bf01 | |
| parent | 594f64f46620e2e2df146bb5bcac8b04dc514323 (diff) | |
| download | systemd-revert-20598-order_noauto.tar.gz | |
Revert "fstab-generator, core/mount: Avoid special fs target before dependency only if nofail is used"revert-20598-order_noauto
| -rw-r--r-- | src/core/mount.c | 10 | ||||
| -rw-r--r-- | src/fstab-generator/fstab-generator.c | 3 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/core/mount.c b/src/core/mount.c index 0170406351..fcff70d40b 100644 --- a/src/core/mount.c +++ b/src/core/mount.c @@ -84,6 +84,14 @@ 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); @@ -476,7 +484,7 @@ static int mount_add_default_ordering_dependencies( before = SPECIAL_LOCAL_FS_TARGET; } - if (!mount_is_nofail(m)) { + if (!mount_is_nofail(m) && !mount_is_automount(p)) { 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 ca9b045e85..1c2ffbced0 100644 --- a/src/fstab-generator/fstab-generator.c +++ b/src/fstab-generator/fstab-generator.c @@ -437,7 +437,8 @@ 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_NOFAIL)) + if (post && !FLAGS_SET(flags, MOUNT_AUTOMOUNT) && !FLAGS_SET(flags, MOUNT_NOAUTO) && + !FLAGS_SET(flags, MOUNT_NOFAIL)) fprintf(f, "Before=%s\n", post); if (passno != 0) { |