From 376433a1f47165daca01d528b9e988f681e55457 Mon Sep 17 00:00:00 2001 From: Kroese Date: Fri, 21 Apr 2023 10:49:21 +0200 Subject: [PATCH 1/4] Tabs --- run/run.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/run/run.sh b/run/run.sh index ad0e4c3..4a9f0df 100755 --- a/run/run.sh +++ b/run/run.sh @@ -61,7 +61,8 @@ CPU_OPTS="-smp ${CPU_CORES},sockets=1,cores=${CPU_CORES},threads=1" EXTRA_OPTS="-device virtio-balloon-pci,id=balloon0 -object rng-random,id=rng0,filename=/dev/urandom -device virtio-rng-pci,rng=rng0" ARGS="${DEF_OPTS} ${CPU_OPTS} ${RAM_OPTS} ${KVM_OPTS} ${MON_OPTS} ${SERIAL_OPTS} ${NET_OPTS} ${DISK_OPTS} ${EXTRA_OPTS}" -SPLIT=$(echo -e "${ARGS// -/\\n-}") +SPLIT=$(echo ${ARGS//$'\t'/ }) +SPLIT=$(echo -e "${SPLIT// -/\\n-}") readarray -t ARG <<<"$SPLIT" for a in "${ARG[@]}"; do From 995f4480caf8304d7ce53fd737de8b6bc910dd63 Mon Sep 17 00:00:00 2001 From: Kroese Date: Fri, 21 Apr 2023 10:50:52 +0200 Subject: [PATCH 2/4] Args --- run/run.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/run/run.sh b/run/run.sh index 4a9f0df..29d0fad 100755 --- a/run/run.sh +++ b/run/run.sh @@ -61,8 +61,8 @@ CPU_OPTS="-smp ${CPU_CORES},sockets=1,cores=${CPU_CORES},threads=1" EXTRA_OPTS="-device virtio-balloon-pci,id=balloon0 -object rng-random,id=rng0,filename=/dev/urandom -device virtio-rng-pci,rng=rng0" ARGS="${DEF_OPTS} ${CPU_OPTS} ${RAM_OPTS} ${KVM_OPTS} ${MON_OPTS} ${SERIAL_OPTS} ${NET_OPTS} ${DISK_OPTS} ${EXTRA_OPTS}" -SPLIT=$(echo ${ARGS//$'\t'/ }) -SPLIT=$(echo -e "${SPLIT// -/\\n-}") +SPLIT=${ARGS//$'\t'/ } +SPLIT=${SPLIT// -/\\n-} readarray -t ARG <<<"$SPLIT" for a in "${ARG[@]}"; do From aeed633d22c961dc8a5c3687ccb6db79347f199f Mon Sep 17 00:00:00 2001 From: Kroese Date: Fri, 21 Apr 2023 11:01:45 +0200 Subject: [PATCH 3/4] Arguments --- run/run.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/run/run.sh b/run/run.sh index 29d0fad..b60f5d2 100755 --- a/run/run.sh +++ b/run/run.sh @@ -60,18 +60,15 @@ RAM_OPTS=$(echo "-m ${RAM_SIZE}" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g') CPU_OPTS="-smp ${CPU_CORES},sockets=1,cores=${CPU_CORES},threads=1" EXTRA_OPTS="-device virtio-balloon-pci,id=balloon0 -object rng-random,id=rng0,filename=/dev/urandom -device virtio-rng-pci,rng=rng0" ARGS="${DEF_OPTS} ${CPU_OPTS} ${RAM_OPTS} ${KVM_OPTS} ${MON_OPTS} ${SERIAL_OPTS} ${NET_OPTS} ${DISK_OPTS} ${EXTRA_OPTS}" +ARGS=(${ARGS//$'\t'/}) -SPLIT=${ARGS//$'\t'/ } -SPLIT=${SPLIT// -/\\n-} -readarray -t ARG <<<"$SPLIT" - -for a in "${ARG[@]}"; do +for a in "${ARGS[@]}"; do echo "> '$a'" done set -m ( - qemu-system-x86_64 "${ARG[@]}" & echo $! > "${_QEMU_PID}" + qemu-system-x86_64 "${ARGS[@]}" & echo $! > "${_QEMU_PID}" ) set +m From 4c49d7aba7d3e6add0ce4fed58d773dc243e1f5f Mon Sep 17 00:00:00 2001 From: Kroese Date: Fri, 21 Apr 2023 11:03:07 +0200 Subject: [PATCH 4/4] Arguments --- run/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run/run.sh b/run/run.sh index b60f5d2..e447d28 100755 --- a/run/run.sh +++ b/run/run.sh @@ -60,7 +60,7 @@ RAM_OPTS=$(echo "-m ${RAM_SIZE}" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g') CPU_OPTS="-smp ${CPU_CORES},sockets=1,cores=${CPU_CORES},threads=1" EXTRA_OPTS="-device virtio-balloon-pci,id=balloon0 -object rng-random,id=rng0,filename=/dev/urandom -device virtio-rng-pci,rng=rng0" ARGS="${DEF_OPTS} ${CPU_OPTS} ${RAM_OPTS} ${KVM_OPTS} ${MON_OPTS} ${SERIAL_OPTS} ${NET_OPTS} ${DISK_OPTS} ${EXTRA_OPTS}" -ARGS=(${ARGS//$'\t'/}) +ARGS=("${ARGS//$'\t'/}") for a in "${ARGS[@]}"; do echo "> '$a'"