Changeset 06b0211b in mainline for contrib/conf/ia32-qe.sh

Timestamp:

2013-04-29T11:29:45Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

aa2b32c

Parents:

ba4799a (diff), df956b9b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• contrib/conf/ia32-qe.sh (modified) (2 diffs)

contrib/conf/ia32-qe.sh

@@ -1 +1 @@
 #!/bin/sh
+
+if [ -z "${QEMU_BINARY}" ] ; then
+        QEMU_BINARY="`which --tty-only qemu 2> /dev/null`"
+fi
+
+if [ -z "${QEMU_BINARY}" ] ; then
+        QEMU_BINARY="`which --tty-only qemu-system-i386 2> /dev/null`"
+fi
+
+if [ -z "${QEMU_BINARY}" ] ; then
+        echo "QEMU binary not found"
+fi
 
 DISK_IMG=hdisk.img
@@ -8 +20 @@
 fi
 
-qemu $@ -m 32 -hda "$DISK_IMG" -cdrom image.iso -boot d
+"${QEMU_BINARY}" "$@" -m 32 -hda "$DISK_IMG" -cdrom image.iso -boot d