From 6615a21d578ba9ab053ba0b3deab26ebf88e577b Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Thu, 24 Sep 2015 18:10:05 +0200 Subject: runqemu: don't complain about conflicting machines if they are equal When the MACHINE variable was set as an environment variable, via "export MACHINE=qemuarm" and runqemu was executed as "runqemu qemuarm" The confusing error message appears: Error: conflicting MACHINE types [qemuarm] and [qemuarm] This checks if the two values are equal, in that case there is no problem and execution can continue. Signed-off-by: Pascal Bach Signed-off-by: Ross Burton --- scripts/runqemu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/runqemu b/scripts/runqemu index 23cf5be169..5989507a21 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -111,7 +111,7 @@ while true; do case "$arg" in "qemux86" | "qemux86-64" | "qemuarm" | "qemuarm64" | "qemumips" | "qemumipsel" | \ "qemumips64" | "qemush4" | "qemuppc" | "qemumicroblaze" | "qemuzynq") - [ -z "$MACHINE" ] && MACHINE=$arg || \ + [ -z "$MACHINE" -o "$MACHINE" = "$arg" ] && MACHINE=$arg || \ error "conflicting MACHINE types [$MACHINE] and [$arg]" ;; "ext2" | "ext3" | "ext4" | "jffs2" | "nfs" | "btrfs" | "hddimg" | "hdddirect" ) -- cgit 1.2.3-korg