diff options
| -rwxr-xr-x | scripts/runqemu | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/scripts/runqemu b/scripts/runqemu index 49403a616..1eda1c99b 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -13,7 +13,7 @@ else fi if [ "x$2" != "x" ]; then - TYPE=$1 + TYPE=$2 else TYPE="ext2" fi @@ -39,10 +39,30 @@ if [ "$MACHINE" == "qemuarm" ]; then fi sudo $QEMU -kernel $ZIMAGE -append "root=/dev/sda mem=$QEMU_MEMORY" -net nic,vlan=0 -net tap,vlan=0,ifname=tap0,script=$OEROOT/scripts/qemu-ifup -M versatilepb -hda $HDIMAGE -usb -usbdevice wacom-tablet fi - if [ "$TYPE" == "nfs" -a ]; then + if [ "$TYPE" == "nfs" ]; then dd if=/dev/zero of=/tmp/blank bs=1024 count=8192 - sudo $QEMU -kernel $1 -append "root=/dev/sda nfsroot=192.168.7.1:/srv/qemuarm rw ip=192.168.7.2::192.168.7.1:255.255.255.0" -net nic,vlan=0 -net tap,vlan=0,ifname=tap0,script=$OEROOT/scripts/qemu-ifup -M versatilepb -hda /tmp/blank + sudo $QEMU -kernel $1 -append "root=/dev/nfs nfsroot=192.168.7.1:/srv/qemuarm rw ip=192.168.7.2::192.168.7.1:255.255.255.0" -net nic,vlan=0 -net tap,vlan=0,ifname=tap0,script=$OEROOT/scripts/qemu-ifup -M versatilepb -hda /tmp/blank rm /tmp/blank fi fi +if [ "$MACHINE" == "qemux86" ]; then + if [ "x$ZIMAGE" == "x" ]; then + ZIMAGE=$BUILDDIR/tmp/deploy/images/bzImage-qemux86.bin + fi + + QEMU=`which qemu` + + if [ "$TYPE" == "ext2" ]; then + if [ "x$HDIMAGE" == "x" ]; then + HDIMAGE=$BUILDDIR/tmp/deploy/images/oh-image-pda-qemux86.ext2 + fi + # video=vesafb:1024x768-32@86 + sudo $QEMU -std-vga -kernel $ZIMAGE -append "root=/dev/hda mem=$QEMU_MEMORY" -net nic,vlan=0 -net tap,vlan=0,ifname=tap0,script=$OEROOT/scripts/qemu-ifup -hda $HDIMAGE -usb -usbdevice wacom-tablet + fi + if [ "$TYPE" == "nfs" ]; then + dd if=/dev/zero of=/tmp/blank bs=1024 count=8192 + sudo $QEMU -std-vga -kernel $1 -append "root=/dev/nfs nfsroot=192.168.7.1:/srv/qemuarm rw ip=192.168.7.2::192.168.7.1:255.255.255.0" -net nic,vlan=0 -net tap,vlan=0,ifname=tap0,script=$OEROOT/scripts/qemu-ifup -hda /tmp/blank + rm /tmp/blank + fi +fi |