shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-24 14:50:17 +03:00
Code

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

Browse Source 
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.
This commit is contained in:
Tom Yan 2021-08-31 21:46:04 +08:00
parent 3b78db59d0
commit 195baa1bd8
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/mount.c
View File

@ -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;