From 297962aec78617e9316a9bfcfa212e5b64cb11c2 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Mon, 6 Mar 2023 10:15:06 +0100 Subject: debvm-create: deprecate and hide the -a option At this point, we only forward -a to mmdebstrap. It's not actually that helpful to have this option on both levels, so just keep it on the mmdebstrap level. --- tests/create-and-run.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/create-and-run.sh b/tests/create-and-run.sh index c8efa3e..dfd45bf 100755 --- a/tests/create-and-run.sh +++ b/tests/create-and-run.sh @@ -20,14 +20,13 @@ cleanup() { trap cleanup EXIT INT TERM QUIT ssh-keygen -f "$SSH_KEYPATH" -N '' -set -- case "$ARCHITECTURE" in # Booting an armel kernel on qemu is next to impossible. - armel) set -- -- --architecture armhf ;; + armel) ARCHITECTURE=armel,armhf ;; # Broken kernel #1029270. - i386) set -- -- --architecture amd64 ;; + i386) ARCHITECTURE=i386,amd64 ;; esac -debvm-create -k "$SSH_KEYPATH.pub" -o "$IMAGE" -a "$ARCHITECTURE" -r "$RELEASE" "$@" +debvm-create -k "$SSH_KEYPATH.pub" -o "$IMAGE" -r "$RELEASE" -- --architectures="$ARCHITECTURE" SSH_PORT=2222 timeout 300s debvm-run -s "$SSH_PORT" -i "$IMAGE" & -- cgit v1.2.3