summaryrefslogtreecommitdiffstats
path: root/scripts/poky-qemu-internal
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-01-09 20:13:45 +0000
committerRichard Purdie <richard@openedhand.com>2008-01-09 20:13:45 +0000
commit1a89cd510d8f550dcd70941196d69f7ad2a14106 (patch)
tree0ef49c57a43afda0b6406e059136aa0d95332ad6 /scripts/poky-qemu-internal
parent248c66c6e22ec9df2e8dd83ff913d42d17f358c4 (diff)
downloadpoky-1a89cd510d8f550dcd70941196d69f7ad2a14106.tar.gz
scripts: Further quoting fixes
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3443 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'scripts/poky-qemu-internal')
-rwxr-xr-xscripts/poky-qemu-internal17
1 files changed, 11 insertions, 6 deletions
diff --git a/scripts/poky-qemu-internal b/scripts/poky-qemu-internal
index 82e6a038df..6e883a0469 100755
--- a/scripts/poky-qemu-internal
+++ b/scripts/poky-qemu-internal
@@ -32,6 +32,7 @@
32QEMUIFUP=`which poky-qemu-ifup` 32QEMUIFUP=`which poky-qemu-ifup`
33KERNEL_NETWORK_CMD="ip=192.168.7.2::192.168.7.1:255.255.255.0" 33KERNEL_NETWORK_CMD="ip=192.168.7.2::192.168.7.1:255.255.255.0"
34QEMU_NETWORK_CMD="-net nic,vlan=0 -net tap,vlan=0,ifname=tap0,script=$QEMUIFUP" 34QEMU_NETWORK_CMD="-net nic,vlan=0 -net tap,vlan=0,ifname=tap0,script=$QEMUIFUP"
35KERNCMDLINE="mem=$QEMU_MEMORY"
35 36
36if [ -z "$QEMU_MEMORY" ]; then 37if [ -z "$QEMU_MEMORY" ]; then
37 QEMU_MEMORY="64M" 38 QEMU_MEMORY="64M"
@@ -60,7 +61,8 @@ fi
60if [ "$MACHINE" = "qemuarm" ]; then 61if [ "$MACHINE" = "qemuarm" ]; then
61 QEMU=`which qemu-system-arm` 62 QEMU=`which qemu-system-arm`
62 if [ "$TYPE" = "ext2" ]; then 63 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" 64 KERNCMDLINE="root=/dev/sda console=ttyAMA0 console=tty0 mem=$QEMU_MEMORY"
65 QEMUOPTIONS="$QEMU_NETWORK_CMD -M versatilepb -hda $HDIMAGE -usb -usbdevice wacom-tablet"
64 fi 66 fi
65 if [ "$TYPE" = "nfs" ]; then 67 if [ "$TYPE" = "nfs" ]; then
66 if [ "x$HDIMAGE" = "x" ]; then 68 if [ "x$HDIMAGE" = "x" ]; then
@@ -70,14 +72,16 @@ if [ "$MACHINE" = "qemuarm" ]; then
70 echo "Error, NFS mount point $HDIMAGE doesn't exist" 72 echo "Error, NFS mount point $HDIMAGE doesn't exist"
71 return 73 return
72 fi 74 fi
73 QEMUOPTIONS="-append 'root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD' $QEMU_NETWORK_CMD -M versatilepb" 75 KERNCMDLINE="root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
76 QEMUOPTIONS="$QEMU_NETWORK_CMD -M versatilepb"
74 fi 77 fi
75fi 78fi
76 79
77if [ "$MACHINE" = "qemux86" ]; then 80if [ "$MACHINE" = "qemux86" ]; then
78 QEMU=`which qemu` 81 QEMU=`which qemu`
79 if [ "$TYPE" = "ext2" ]; then 82 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" 83 KERNCMDLINE="root=/dev/hda mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD"
84 QEMUOPTIONS="-std-vga $QEMU_NETWORK_CMD -hda $HDIMAGE -usb -usbdevice wacom-tablet"
81 fi 85 fi
82 if [ "$TYPE" = "nfs" ]; then 86 if [ "$TYPE" = "nfs" ]; then
83 if [ "x$HDIMAGE" = "x" ]; then 87 if [ "x$HDIMAGE" = "x" ]; then
@@ -87,7 +91,8 @@ if [ "$MACHINE" = "qemux86" ]; then
87 echo "Error, NFS mount point $HDIMAGE doesn't exist." 91 echo "Error, NFS mount point $HDIMAGE doesn't exist."
88 return 92 return
89 fi 93 fi
90 QEMUOPTIONS="-std-vga -append 'root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD' $QEMU_NETWORK_CMD" 94 KERNCMDLINE="root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
95 QEMUOPTIONS="-std-vga $QEMU_NETWORK_CMD"
91 fi 96 fi
92fi 97fi
93 98
@@ -123,5 +128,5 @@ if [ "x$QEMUOPTIONS" = "x" ]; then
123fi 128fi
124 129
125echo "Running $QEMU using sudo..." 130echo "Running $QEMU using sudo..."
126echo "$QEMU -kernel $ZIMAGE $QEMUOPTIONS $SERIALOPTS" 131echo $QEMU -kernel $ZIMAGE $QEMUOPTIONS $SERIALOPTS --append "$KERNCMDLINE"
127sudo "$QEMU -kernel $ZIMAGE $QEMUOPTIONS $SERIALOPTS" 132sudo $QEMU -kernel $ZIMAGE $QEMUOPTIONS $SERIALOPTS --append "$KERNCMDLINE"