1
0
mirror of https://github.com/systemd/systemd synced 2025-11-19 16:54:46 +01:00

Compare commits

..

2 Commits

Author SHA1 Message Date
Yu Watanabe
02fea5b412 ci/oss-fuzz: switch to Ubuntu 24.04
With
https://github.com/google/oss-fuzz/pull/14112 and
https://github.com/google/oss-fuzz/pull/14128,
we can now use Ubuntu 24.04. Let's bump the image version.

Note, the i386 build failure mentioned in the removed comment is related to
https://bugs.launchpad.net/ubuntu/+source/linux-signed-azure/+bug/2071445
https://github.com/actions/runner-images/issues/9977
and has been already fixed.
2025-10-21 15:09:24 +09:00
Yu Watanabe
f88f0271f8 TEST-75-RESOLVED: stop socket units before stopping the main service
Fixes the following warning:
TEST-75-RESOLVED.sh[2251]: ++ restart_resolved
TEST-75-RESOLVED.sh[2251]: ++ systemctl stop systemd-resolved.service
TEST-75-RESOLVED.sh[2271]: Stopping 'systemd-resolved.service', but its triggering units are still active:
TEST-75-RESOLVED.sh[2271]: systemd-resolved-monitor.socket, systemd-resolved-varlink.socket
2025-10-21 15:07:53 +09:00
2 changed files with 6 additions and 2 deletions

View File

@ -22,8 +22,7 @@ on:
- main
jobs:
Fuzzing:
# FIXME: Figure out why 32-bit applications fail to run in docker on Ubuntu 24.04.
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
if: github.repository == 'systemd/systemd'
concurrency:
group: ${{ github.workflow }}-${{ matrix.sanitizer }}-${{ matrix.architecture }}-${{ github.ref }}

View File

@ -64,11 +64,13 @@ monitor_check_rr() (
)
restart_resolved() {
systemctl stop systemd-resolved-monitor.socket systemd-resolved-varlink.socket
systemctl stop systemd-resolved.service
(! systemctl is-failed systemd-resolved.service)
# Reset the restart counter since we call this method a bunch of times
# and can occasionally hit the default rate limit
systemctl reset-failed systemd-resolved.service
systemctl start systemd-resolved-monitor.socket systemd-resolved-varlink.socket
systemctl start systemd-resolved.service
}
@ -333,6 +335,7 @@ manual_testcase_02_mdns_llmnr() {
} >/run/systemd/resolved.conf.d/90-mdns-llmnr.conf
restart_resolved
# make sure networkd is not running.
systemctl stop systemd-networkd.socket systemd-networkd-varlink.socket
systemctl stop systemd-networkd.service
assert_in 'no' "$(resolvectl mdns hoge)"
assert_in 'no' "$(resolvectl llmnr hoge)"
@ -1367,7 +1370,9 @@ testcase_15_wait_online_dns() {
resolvectl domain dns0 ""
# Stop systemd-resolved before calling systemd-networkd-wait-online. It should retry connections.
systemctl stop systemd-resolved-monitor.socket systemd-resolved-varlink.socket
systemctl stop systemd-resolved.service
systemctl start systemd-resolved-monitor.socket systemd-resolved-varlink.socket
# Begin systemd-networkd-wait-online --dns
systemd-run -u "$unit" -p "Environment=SYSTEMD_LOG_LEVEL=debug" -p "Environment=SYSTEMD_LOG_TARGET=journal" --service-type=exec \