From: Tom Yan <tom.ty89@gmail.com>
Date: Tue, 31 Aug 2021 13:46:04 +0000 (+0800)
Subject: core/mount: also add default before dependency for automount mount units
X-Git-Tag: v250-rc3~69^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=195baa1bd82e2d0b3fe460d68404f09ec8d9de4b;p=thirdparty%2Fsystemd.git

core/mount: also add default before dependency for automount mount units

The dependency should not prevent automount from working as expected,
and we do not want them to be stopped too early if they are active.
---

diff --git a/src/core/mount.c b/src/core/mount.c
index 35b56426d41..23ffabd60d9 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;