shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-09-13 05:44:40 +03:00
Code Activity

core/unit: ignore dropins for masked units completely when checking need_reload

Browse Source 
Follow-up for 19a44dfe45

If a drop-in is set from upper level, e.g. global unit_type.d/,
even if a unit is masked, its dropin_paths would still be partially
populated. However, unit_need_daemon_reload() would always
compare u->dropin_paths with empty strv in case of masked units,
resulting in it always returning true. Instead, let's ignore
dropins entirely here.

Fixes #33672
This commit is contained in:
Mike Yuan
2024-07-08 17:12:20 +02:00
committed by David Tardon
parent 8b6de9e638
commit 11b3775f51
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/unit.c
View File

@@ -3796,8 +3796,6 @@ static bool fragment_mtime_newer(const char *path, usec_t mtime, bool path_maske
} }
bool unit_need_daemon_reload(Unit *u) { bool unit_need_daemon_reload(Unit *u) {
_cleanup_strv_free_ char **dropins = NULL;
assert(u); assert(u);
assert(u->manager); assert(u->manager);
@@ -3813,16 +3811,20 @@ bool unit_need_daemon_reload(Unit *u) {
if (fragment_mtime_newer(u->source_path, u->source_mtime, false)) if (fragment_mtime_newer(u->source_path, u->source_mtime, false))
return true; return true;
if (u->load_state == UNIT_LOADED) if (u->load_state == UNIT_LOADED) {
(void) unit_find_dropin_paths(u, &dropins); _cleanup_strv_free_ char **dropins = NULL;
if (!strv_equal(u->dropin_paths, dropins))
return true;
/* … any drop-ins that are masked are simply omitted from the list. */ (void) unit_find_dropin_paths(u, &dropins);
STRV_FOREACH(path, u->dropin_paths)
if (fragment_mtime_newer(*path, u->dropin_mtime, false)) if (!strv_equal(u->dropin_paths, dropins))
return true; return true;
/* … any drop-ins that are masked are simply omitted from the list. */
STRV_FOREACH(path, u->dropin_paths)
if (fragment_mtime_newer(*path, u->dropin_mtime, false))
return true;
}
return false; return false;
} }

3
test/units/TEST-07-PID1.issue-33672.sh
View File

@@ -37,5 +37,4 @@ systemctl unmask "$UNIT"
assert_eq "$(systemctl show -P NeedDaemonReload "$UNIT")" no assert_eq "$(systemctl show -P NeedDaemonReload "$UNIT")" no
systemctl mask "$UNIT" systemctl mask "$UNIT"
# FIXME: should be "no" assert_eq "$(systemctl show -P NeedDaemonReload "$UNIT")" no
assert_eq "$(systemctl show -P NeedDaemonReload "$UNIT")" yes