diff --git a/.packit.yml b/.packit.yml index 2dcc9e86ca4..fa86c5fa05e 100644 --- a/.packit.yml +++ b/.packit.yml @@ -44,6 +44,10 @@ actions: # Temporarily add libarchive-devel build dep and libarchive runtime dep # until the change propagates to Rawhide's specfile - "sed -ri '0,/^BuildRequires: .+$/s//&\\nBuildRequires: libarchive-devel\\nRequires: libarchive/' .packit_rpm/systemd.spec" + # FIXME: temporarily build without BPF stuff, since there's currently no + # bpftool package in Rawhide (at least not until [0] lands) + # [0] https://bodhi.fedoraproject.org/updates/FEDORA-2024-bb73636f1d + - "sed -nri '1N;2N;/\\nBuildRequires:\\s+bpftool$/{N;N;d};P;N;D' .packit_rpm/systemd.spec" jobs: - job: copr_build diff --git a/src/test/test-path.c b/src/test/test-path.c index 22ed88f7e71..e49653a2404 100644 --- a/src/test/test-path.c +++ b/src/test/test-path.c @@ -100,7 +100,8 @@ static int _check_states(unsigned line, service_state_to_string(service->state), service_result_to_string(service->result)); - if (service->state == SERVICE_FAILED && service->main_exec_status.status == EXIT_CGROUP) { + if (service->state == SERVICE_FAILED && + (service->main_exec_status.status == EXIT_CGROUP || service->result == SERVICE_FAILURE_RESOURCES)) { const char *ci = ci_environment(); /* On a general purpose system we may fail to start the service for reasons which are