summaryrefslogtreecommitdiff
path: root/src/fstab-generator
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2021-12-11 14:06:38 +0100
committerGitHub <noreply@github.com>2021-12-11 14:06:38 +0100
commit433cfaf038165ba47851d66d20cb829f7a2bac69 (patch)
treeabcfe178e6483bbc7751eb193047e82e683b2193 /src/fstab-generator
parent74d99c3ffb92a29313b5eee09e2cba3938e12349 (diff)
parent195baa1bd82e2d0b3fe460d68404f09ec8d9de4b (diff)
downloadsystemd-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/fstab-generator')
-rw-r--r--src/fstab-generator/fstab-generator.c3
1 files changed, 1 insertions, 2 deletions
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) {