From 9424b6f998917e2926c0b7afb8d7a968590da335 Mon Sep 17 00:00:00 2001 From: Hans Dedecker Date: Wed, 24 Apr 2019 19:54:44 +0200 Subject: [PATCH] scripts/qemustart: fix usage with networking support Commit 8bf500eb79 added support for qemu usage without networking support but broke networking support as -n and -z do not work with unquoted argument; fix this by quoting the arguments. Fixes 8bf500eb79 Signed-off-by: Hans Dedecker --- scripts/qemustart | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/qemustart b/scripts/qemustart index 951f225272..076d4bbcfe 100755 --- a/scripts/qemustart +++ b/scripts/qemustart @@ -74,7 +74,7 @@ check_setup_() { } check_setup() { - [ -z $o_nonetwork ] || return 0 + [ -z "$o_nonetwork" ] || return 0 check_setup_ || { __errmsg "please check the script content to see the environment requirement" return 1 @@ -187,7 +187,7 @@ start_qemu_armvirt() { ) } - [ -n $o_nonetwork ] || { + [ -n "$o_nonetwork" ] || { o_qemu_extra+=( \ "-netdev" "bridge,id=lan,br=$BR_LAN,helper=$HELPER" \ "-device" "virtio-net-pci,id=devlan,netdev=lan,mac=$MAC_LAN" \ @@ -229,7 +229,7 @@ start_qemu_malta() { # NOTE: order of wan, lan -device arguments matters as it will affect which # one will be actually used as the wan, lan network interface inside the # guest machine - [ -n $o_nonetwork ] || { + [ -n "$o_nonetwork" ] || { o_qemu_extra+=( \ "-netdev" "bridge,id=wan,br=$BR_WAN,helper=$HELPER" "-device" \ "virtio-net-pci,id=devwan,netdev=wan,mac=$MAC_WAN" \ @@ -276,7 +276,7 @@ start_qemu_x86() { ) } - [ -n $o_nonetwork ] || { + [ -n "$o_nonetwork" ] || { o_qemu_extra+=( \ "-netdev" "bridge,id=lan,br=$BR_LAN,helper=$HELPER" \ "-device" "virtio-net-pci,id=devlan,netdev=lan,mac=$MAC_LAN" \ -- 2.25.1