summaryrefslogtreecommitdiff
path: root/tests/create-and-run.sh
diff options
context:
space:
mode:
authorHelmut Grohne <helmut@subdivi.de>2023-03-06 10:15:06 +0100
committerHelmut Grohne <helmut@subdivi.de>2023-03-06 10:15:06 +0100
commit297962aec78617e9316a9bfcfa212e5b64cb11c2 (patch)
treeef74ffc320b390813ebe853c4a5a3a3486540a5c /tests/create-and-run.sh
parentdc972d6e1b1afb3f88319f55dc410c57c3f58563 (diff)
downloaddebvm-297962aec78617e9316a9bfcfa212e5b64cb11c2.tar.gz
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.
Diffstat (limited to 'tests/create-and-run.sh')
-rwxr-xr-xtests/create-and-run.sh7
1 files changed, 3 insertions, 4 deletions
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" &