shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-22 06:50:18 +03:00
Code

mount: do not update exec deps on mountinfo changes

Browse Source 
Fixes: #13978
This commit is contained in:
Lennart Poettering 2019-11-15 14:00:54 +01:00
parent b8e5776d38
commit bf7eedbf8f
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/core/mount.c
View File

@ -550,6 +550,32 @@ static int mount_verify(Mount *m) {
return 0;
}
static int mount_add_non_exec_dependencies(Mount *m) {
int r;
assert(m);
/* Adds in all dependencies directly responsible for ordering the mount, as opposed to dependencies
* resulting from the ExecContext and such. */
r = mount_add_device_dependencies(m);
if (r < 0)
return r;
r = mount_add_mount_dependencies(m);
if (r < 0)
return r;
r = mount_add_quota_dependencies(m);
if (r < 0)
return r;
r = mount_add_default_dependencies(m);
if (r < 0)
return r;
return 0;
}
static int mount_add_extras(Mount *m) {
Unit *u = UNIT(m);
int r;
@ -577,18 +603,6 @@ static int mount_add_extras(Mount *m) {
return r;
}
r = mount_add_device_dependencies(m);
if (r < 0)
return r;
r = mount_add_mount_dependencies(m);
if (r < 0)
return r;
r = mount_add_quota_dependencies(m);
if (r < 0)
return r;
r = unit_patch_contexts(u);
if (r < 0)
return r;
@ -601,7 +615,7 @@ static int mount_add_extras(Mount *m) {
if (r < 0)
return r;
r = mount_add_default_dependencies(m);
r = mount_add_non_exec_dependencies(m);
if (r < 0)
return r;
@ -1574,7 +1588,7 @@ static int mount_setup_existing_unit(
unit_remove_dependencies(u, UNIT_DEPENDENCY_MOUNTINFO_IMPLICIT);
r = mount_add_extras(MOUNT(u));
r = mount_add_non_exec_dependencies(MOUNT(u));
if (r < 0)
return r;
}