diff options
Diffstat (limited to 'scripts/poky-qemu-internal')
| -rwxr-xr-x | scripts/poky-qemu-internal | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/scripts/poky-qemu-internal b/scripts/poky-qemu-internal index e715844af4..82e6a038df 100755 --- a/scripts/poky-qemu-internal +++ b/scripts/poky-qemu-internal | |||
| @@ -60,7 +60,7 @@ fi | |||
| 60 | if [ "$MACHINE" = "qemuarm" ]; then | 60 | if [ "$MACHINE" = "qemuarm" ]; then |
| 61 | QEMU=`which qemu-system-arm` | 61 | QEMU=`which qemu-system-arm` |
| 62 | if [ "$TYPE" = "ext2" ]; then | 62 | if [ "$TYPE" = "ext2" ]; then |
| 63 | QEMUOPTIONS="-append \"root=/dev/sda console=ttyAMA0 console=tty0 mem=$QEMU_MEMORY\" $QEMU_NETWORK_CMD -M versatilepb -hda $HDIMAGE -usb -usbdevice wacom-tablet" | 63 | QEMUOPTIONS="-append 'root=/dev/sda console=ttyAMA0 console=tty0 mem=$QEMU_MEMORY' $QEMU_NETWORK_CMD -M versatilepb -hda $HDIMAGE -usb -usbdevice wacom-tablet" |
| 64 | fi | 64 | fi |
| 65 | if [ "$TYPE" = "nfs" ]; then | 65 | if [ "$TYPE" = "nfs" ]; then |
| 66 | if [ "x$HDIMAGE" = "x" ]; then | 66 | if [ "x$HDIMAGE" = "x" ]; then |
| @@ -70,14 +70,14 @@ if [ "$MACHINE" = "qemuarm" ]; then | |||
| 70 | echo "Error, NFS mount point $HDIMAGE doesn't exist" | 70 | echo "Error, NFS mount point $HDIMAGE doesn't exist" |
| 71 | return | 71 | return |
| 72 | fi | 72 | fi |
| 73 | QEMUOPTIONS="-append \"root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD\" $QEMU_NETWORK_CMD -M versatilepb" | 73 | QEMUOPTIONS="-append 'root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD' $QEMU_NETWORK_CMD -M versatilepb" |
| 74 | fi | 74 | fi |
| 75 | fi | 75 | fi |
| 76 | 76 | ||
| 77 | if [ "$MACHINE" = "qemux86" ]; then | 77 | if [ "$MACHINE" = "qemux86" ]; then |
| 78 | QEMU=`which qemu` | 78 | QEMU=`which qemu` |
| 79 | if [ "$TYPE" = "ext2" ]; then | 79 | if [ "$TYPE" = "ext2" ]; then |
| 80 | QEMUOPTIONS="-std-vga -append \"root=/dev/hda mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD\" $QEMU_NETWORK_CMD -hda $HDIMAGE -usb -usbdevice wacom-tablet" | 80 | QEMUOPTIONS="-std-vga -append 'root=/dev/hda mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD' $QEMU_NETWORK_CMD -hda $HDIMAGE -usb -usbdevice wacom-tablet" |
| 81 | fi | 81 | fi |
| 82 | if [ "$TYPE" = "nfs" ]; then | 82 | if [ "$TYPE" = "nfs" ]; then |
| 83 | if [ "x$HDIMAGE" = "x" ]; then | 83 | if [ "x$HDIMAGE" = "x" ]; then |
| @@ -87,7 +87,7 @@ if [ "$MACHINE" = "qemux86" ]; then | |||
| 87 | echo "Error, NFS mount point $HDIMAGE doesn't exist." | 87 | echo "Error, NFS mount point $HDIMAGE doesn't exist." |
| 88 | return | 88 | return |
| 89 | fi | 89 | fi |
| 90 | QEMUOPTIONS="-std-vga -append \"root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD\" $QEMU_NETWORK_CMD" | 90 | QEMUOPTIONS="-std-vga -append 'root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD' $QEMU_NETWORK_CMD" |
| 91 | fi | 91 | fi |
| 92 | fi | 92 | fi |
| 93 | 93 | ||
| @@ -124,6 +124,4 @@ fi | |||
| 124 | 124 | ||
| 125 | echo "Running $QEMU using sudo..." | 125 | echo "Running $QEMU using sudo..." |
| 126 | echo "$QEMU -kernel $ZIMAGE $QEMUOPTIONS $SERIALOPTS" | 126 | echo "$QEMU -kernel $ZIMAGE $QEMUOPTIONS $SERIALOPTS" |
| 127 | sudo $QEMU -kernel $ZIMAGE $QEMUOPTIONS $SERIALOPTS | 127 | sudo "$QEMU -kernel $ZIMAGE $QEMUOPTIONS $SERIALOPTS" |
| 128 | |||
| 129 | |||
