diff options
| author | Mike Yuan <me@yhndnzj.com> | 2024-07-08 17:12:20 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2024-07-12 15:59:36 +0200 |
| commit | 11b3775f514f521f353741ff6ac4d66cf0e928e8 (patch) | |
| tree | c3a5b2c2bca55c99a4950947cbd27668d7147a2d /test/units/TEST-07-PID1.issue-33672.sh | |
| parent | test: add a reproducer for #33672 (diff) | |
| download | systemd-11b3775f514f521f353741ff6ac4d66cf0e928e8.tar.xz systemd-11b3775f514f521f353741ff6ac4d66cf0e928e8.zip | |
core/unit: ignore dropins for masked units completely when checking need_reload
Follow-up for 19a44dfe4525ab01caf593a9c2beada4b412910d
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
Diffstat (limited to '')
| -rwxr-xr-x | test/units/TEST-07-PID1.issue-33672.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/test/units/TEST-07-PID1.issue-33672.sh b/test/units/TEST-07-PID1.issue-33672.sh index ab388e32b1..370497c346 100755 --- a/test/units/TEST-07-PID1.issue-33672.sh +++ b/test/units/TEST-07-PID1.issue-33672.sh @@ -37,5 +37,4 @@ systemctl unmask "$UNIT" assert_eq "$(systemctl show -P NeedDaemonReload "$UNIT")" no systemctl mask "$UNIT" -# FIXME: should be "no" -assert_eq "$(systemctl show -P NeedDaemonReload "$UNIT")" yes +assert_eq "$(systemctl show -P NeedDaemonReload "$UNIT")" no |