runqemu: Use different nfs paths for qemuarm and qemux86

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@878 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 7 insertions, 5 deletions

diff --git a/scripts/runqemu b/scripts/runqemu
index 1eda1c99b8..dead347ea6 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -41,7 +41,7 @@ if [ "$MACHINE" == "qemuarm" ]; then
     fi
     if [ "$TYPE" == "nfs" ]; then
         dd if=/dev/zero of=/tmp/blank bs=1024 count=8192
-        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
+        sudo $QEMU -kernel $1 -append "root=/dev/nfs nfsroot=192.168.7.1:/srv/nfs/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
@@ -62,7 +62,7 @@ if [ "$MACHINE" == "qemux86" ]; then
     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
+        sudo $QEMU -std-vga -kernel $1 -append "root=/dev/nfs nfsroot=192.168.7.1:/srv/nfs/qemux86 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
diff --git a/scripts/runqemu.README b/scripts/runqemu.README
index 713e273946..2f68b85cb8 100644
--- a/scripts/runqemu.README
+++ b/scripts/runqemu.README
@@ -24,24 +24,26 @@ As root;
 
 % apt-get install nfs-kernel-server
 
-% mkdir /srv/qemuarm
+% mkdir /srv/nfs/qemuarm
 
 Edit via /etc/exports :
 
 # /etc/exports: the access control list for filesystems which may be exported
 #               to NFS clients.  See exports(5).
-/srv/qemuarm 192.168.7.2(rw,no_root_squash)
+/srv/nfs/qemuarm 192.168.7.2(rw,no_root_squash)
 
 % /etc/init.d/nfs-kernel-server restart
 
 % modprobe tun
 
-untar build/tmp/deploy/images/<built image>.rootfs.tar.bz2 into /srv/qemuarm
+untar build/tmp/deploy/images/<built image>.rootfs.tar.bz2 into /srv/nfs/qemuarm
 
 Finally, launch:
 
 % runqemu <target> nfs
 
+(Substitute qemux86 for qemuarm when using qemux86)
+
 Notes
 =====