Changeset fa33ac4 in mainline

Timestamp:

2013-03-20T16:56:07Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

119b46e

Parents:

f597bc4

Message:

make QEMU scripts compatible with newer distros (that lack the legacy "qemu" binary)

Location:

contrib/conf

Files:

• ia32-qe.sh (modified) (2 diffs)
• net-qe.sh (modified) (1 diff)

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

contrib/conf/net-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-x86_64 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
 
 case "$1" in
         ne2k)
                 shift
-                qemu $@ -device ne2k_isa,irq=5,vlan=0 -net user -boot d -redir udp:8080::8080 -redir udp:8081::8081 -redir tcp:8080::8080 -redir tcp:8081::8081 -cdrom image.iso
+                "${QEMU_BINARY}" "$@" -device ne2k_isa,irq=5,vlan=0 -net user -boot d -redir udp:8080::8080 -redir udp:8081::8081 -redir tcp:8080::8080 -redir tcp:8081::8081 -cdrom image.iso
                 ;;
         e1k)
                 shift
-                qemu $@ -device e1000,vlan=0 -net user -boot d -redir udp:8080::8080 -redir udp:8081::8081 -redir tcp:8080::8080 -redir tcp:8081::8081 -cdrom image.iso
+                "${QEMU_BINARY}" "$@" -device e1000,vlan=0 -net user -boot d -redir udp:8080::8080 -redir udp:8081::8081 -redir tcp:8080::8080 -redir tcp:8081::8081 -cdrom image.iso
                 ;;
         rtl8139)
                 shift
-                qemu $@ -device rtl8139,vlan=0 -net user -boot d -redir udp:8080::8080 -redir udp:8081::8081 -redir tcp:8080::8080 -redir tcp:8081::8081 -cdrom image.iso
+                "${QEMU_BINARY}" "$@" -device rtl8139,vlan=0 -net user -boot d -redir udp:8080::8080 -redir udp:8081::8081 -redir tcp:8080::8080 -redir tcp:8081::8081 -cdrom image.iso
                 ;;
         *)