Skip to content

Commit

Permalink
scripts/qemustart: fix usage with networking support
Browse files Browse the repository at this point in the history
Commit 8bf500e 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 8bf500e

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
  • Loading branch information
dedeckeh committed Apr 24, 2019
1 parent 6e7e2f4 commit 9424b6f
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions scripts/qemustart
Expand Up @@ -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
Expand Down Expand Up @@ -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" \
Expand Down Expand Up @@ -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" \
Expand Down Expand Up @@ -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" \
Expand Down

0 comments on commit 9424b6f

Please sign in to comment.