X Tutup
Skip to content

Commit 195baa1

Browse files
committed
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.
1 parent 3b78db5 commit 195baa1

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

src/core/mount.c

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,6 @@ static MountParameters* get_mount_parameters(Mount *m) {
8484
return get_mount_parameters_fragment(m);
8585
}
8686

87-
static bool mount_is_automount(const MountParameters *p) {
88-
assert(p);
89-
90-
return fstab_test_option(p->options,
91-
"comment=systemd.automount\0"
92-
"x-systemd.automount\0");
93-
}
94-
9587
static bool mount_is_network(const MountParameters *p) {
9688
assert(p);
9789

@@ -484,7 +476,7 @@ static int mount_add_default_ordering_dependencies(
484476
before = SPECIAL_LOCAL_FS_TARGET;
485477
}
486478

487-
if (!mount_is_nofail(m) && !mount_is_automount(p)) {
479+
if (!mount_is_nofail(m)) {
488480
r = unit_add_dependency_by_name(UNIT(m), UNIT_BEFORE, before, true, mask);
489481
if (r < 0)
490482
return r;

0 commit comments

Comments
 (0)
X Tutup