From 03bab76008a401770a4146f3931d299250955cbb Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 22 Mar 2017 13:59:30 -0700 Subject: [PATCH] Get a little more protective of user input in qemu --- start-qemu | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/start-qemu b/start-qemu index 5f37a0c..58b9303 100755 --- a/start-qemu +++ b/start-qemu @@ -15,7 +15,7 @@ hostArch="$(uname -m)" qemuArch="${QEMU_ARCH:-$hostArch}" qemu="${QEMU_BIN:-qemu-system-$qemuArch}" qemuArgs=() -qemuPorts=( 22 $QEMU_PORTS ) +qemuPorts=( 22 ${QEMU_PORTS:-} ) if [ -e /dev/kvm ]; then qemuArgs+=( -enable-kvm ) @@ -31,7 +31,7 @@ fi qemuArgs+=( -smp "${QEMU_CPU:-1}" ) qemuArgs+=( -m "${QEMU_RAM:-512}" ) -if [ "$QEMU_HDA" ]; then +if [ -n "${QEMU_HDA:-}" ]; then if [ ! -f "$QEMU_HDA" -o ! -s "$QEMU_HDA" ]; then ( set -x @@ -43,17 +43,17 @@ if [ "$QEMU_HDA" ]; then qemuArgs+=( -drive file="$QEMU_HDA",index=0,media=disk,discard=unmap ) fi -if [ "$QEMU_CDROM" ]; then +if [ -n "${QEMU_CDROM:-}" ]; then qemuArgs+=( -cdrom "$QEMU_CDROM" ) fi -if [ "$QEMU_BOOT" ]; then +if [ -n "${QEMU_BOOT:-}" ]; then qemuArgs+=( -boot "$QEMU_BOOT" ) fi netArg='user' netArg+=",hostname=$(hostname)" -if [ "$QEMU_NET_USER_EXTRA" ]; then +if [ -n "${QEMU_NET_USER_EXTRA:-}" ]; then netArg+=",$QEMU_NET_USER_EXTRA" fi for port in "${qemuPorts[@]}"; do