]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
TEST-13-NSPAWN: Use timeout --foreground in two more places
authorDaan De Meyer <daan@amutable.com>
Thu, 26 Mar 2026 08:01:58 +0000 (09:01 +0100)
committerLuca Boccassi <luca.boccassi@gmail.com>
Fri, 22 May 2026 12:27:50 +0000 (13:27 +0100)
(cherry picked from commit 518dcfadab8c540cff056a3bd94d5c817e7a17b2)

test/units/TEST-13-NSPAWN.nspawn-oci.sh
test/units/TEST-13-NSPAWN.nspawn.sh

index 1fd2a5ad76774b30c601215a0e61b69237532772..0d85518a1d39235a02da13eec649ea72edbe1d90 100755 (executable)
@@ -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=(
index d5cc05b89f5823ba8697af4c1701d99af542101f..cbbea1673588dd22ed992e711673445600d8a2c3 100755 (executable)
@@ -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
     #