From: Daan De Meyer Date: Thu, 26 Mar 2026 08:01:58 +0000 (+0100) Subject: TEST-13-NSPAWN: Use timeout --foreground in two more places X-Git-Tag: v260.2~244 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c4ab1c308bb5cd0175bfd20a5e8d592ed6d087f;p=thirdparty%2Fsystemd.git TEST-13-NSPAWN: Use timeout --foreground in two more places (cherry picked from commit 518dcfadab8c540cff056a3bd94d5c817e7a17b2) --- diff --git a/test/units/TEST-13-NSPAWN.nspawn-oci.sh b/test/units/TEST-13-NSPAWN.nspawn-oci.sh index 1fd2a5ad767..0d85518a1d3 100755 --- a/test/units/TEST-13-NSPAWN.nspawn-oci.sh +++ b/test/units/TEST-13-NSPAWN.nspawn-oci.sh @@ -395,7 +395,7 @@ touch /opt/readonly/foo && exit 1 exit 0 EOF -timeout 30 systemd-nspawn --oci-bundle="$OCI" +timeout --foreground 30 systemd-nspawn --oci-bundle="$OCI" # Test a couple of invalid configs INVALID_SNIPPETS=( diff --git a/test/units/TEST-13-NSPAWN.nspawn.sh b/test/units/TEST-13-NSPAWN.nspawn.sh index d5cc05b89f5..cbbea167358 100755 --- a/test/units/TEST-13-NSPAWN.nspawn.sh +++ b/test/units/TEST-13-NSPAWN.nspawn.sh @@ -575,7 +575,7 @@ ip link | grep wl-renamed1 EOF fi - timeout 30 systemd-nspawn --directory="$root" + timeout --foreground 30 systemd-nspawn --directory="$root" # And now for stuff that needs to run separately #