From: Daan De Meyer Date: Tue, 25 Nov 2025 09:41:24 +0000 (+0100) Subject: TEST-88-UPGRADE: Stop resolved hook socket before downgrading X-Git-Tag: v259-rc2~23 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32b10d0d28d159eecb7f072d1fb455f2de2ade09;p=thirdparty%2Fsystemd.git TEST-88-UPGRADE: Stop resolved hook socket before downgrading Otherwise it'll remain active and cause networkd to get started again during the downgrade. --- diff --git a/test/units/TEST-88-UPGRADE.sh b/test/units/TEST-88-UPGRADE.sh index 8bff38d2477..96bc8f8aee0 100755 --- a/test/units/TEST-88-UPGRADE.sh +++ b/test/units/TEST-88-UPGRADE.sh @@ -81,11 +81,11 @@ systemd-run --on-calendar="@$after_2h" -u upgrade_timer_test date timer1=$(systemctl show -P TimersCalendar upgrade_timer_test.timer) timer2=$(systemctl show -P NextElapseUSecRealtime upgrade_timer_test.timer) -dnf downgrade -y --allowerasing --disablerepo '*' "$pkgdir"/distro/*.rpm - # FIXME: See https://github.com/systemd/systemd/pull/39293 systemctl stop systemd-networkd-resolve-hook.socket || true +dnf downgrade -y --allowerasing --disablerepo '*' "$pkgdir"/distro/*.rpm + # Some distros don't ship networkd, so the test will always fail if command -v networkctl >/dev/null; then networkd=1