summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2012-10-03 15:13:53 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-10 15:21:41 +0100
commit2d93461815b32c8a34208aadec3f9f24296b2b34 (patch)
tree53128e3126d0678c2882764c3970a2da3954a715
parent1e9d77c3b27ae748d2354bc12fd2709ed9d7dc2a (diff)
downloadpoky-2d93461815b32c8a34208aadec3f9f24296b2b34.tar.gz
runqemu: allow multiple unfs instances to run simultaneously
A miscalculation in the way the port numbers of mountd and nfsd are created was causing conflicts when starting multiple instances of qemu using userspace nfs. Thanks to Rudolf Streif for proposing this fix! Fixes [YOCTO #1969] (From OE-Core rev: 94eef772c283170d19ba92c8de0054cd093fc487) Signed-off-by: Scott Garman <scott.a.garman@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/runqemu-export-rootfs4
-rwxr-xr-xscripts/runqemu-internal4
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/runqemu-export-rootfs b/scripts/runqemu-export-rootfs
index 90edc8a216..bbdaf5ba0f 100755
--- a/scripts/runqemu-export-rootfs
+++ b/scripts/runqemu-export-rootfs
@@ -82,9 +82,9 @@ NFS_MOUNTPROG=$[ 21111 + $NFS_INSTANCE ]
82# rpc.nfsd RPC port 82# rpc.nfsd RPC port
83NFS_NFSPROG=$[ 11111 + $NFS_INSTANCE ] 83NFS_NFSPROG=$[ 11111 + $NFS_INSTANCE ]
84# NFS port number 84# NFS port number
85NFS_PORT=$[ 3049 + $NFS_INSTANCE ] 85NFS_PORT=$[ 3049 + 2 * $NFS_INSTANCE ]
86# mountd port number 86# mountd port number
87MOUNT_PORT=$[ 3048 + $NFS_INSTANCE ] 87MOUNT_PORT=$[ 3048 + 2 * $NFS_INSTANCE ]
88 88
89## For debugging you would additionally add 89## For debugging you would additionally add
90## --debug all 90## --debug all
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index 0f07bad970..7ca00f8fa0 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -277,8 +277,8 @@ if [ "$FSTYPE" = "nfs" ]; then
277 NFS_DIR=`echo $ROOTFS | sed 's/^[^:]*:\(.*\)/\1/'` 277 NFS_DIR=`echo $ROOTFS | sed 's/^[^:]*:\(.*\)/\1/'`
278 MOUNTD_RPCPORT=$[ 21111 + $NFS_INSTANCE ] 278 MOUNTD_RPCPORT=$[ 21111 + $NFS_INSTANCE ]
279 NFSD_RPCPORT=$[ 11111 + $NFS_INSTANCE ] 279 NFSD_RPCPORT=$[ 11111 + $NFS_INSTANCE ]
280 NFSD_PORT=$[ 3049 + $NFS_INSTANCE ] 280 NFSD_PORT=$[ 3049 + 2 * $NFS_INSTANCE ]
281 MOUNTD_PORT=$[ 3048 + $NFS_INSTANCE ] 281 MOUNTD_PORT=$[ 3048 + 2 * $NFS_INSTANCE ]
282 UNFS_OPTS="nfsvers=2,mountprog=$MOUNTD_RPCPORT,nfsprog=$NFSD_RPCPORT,udp,port=$NFSD_PORT,mountport=$MOUNTD_PORT" 282 UNFS_OPTS="nfsvers=2,mountprog=$MOUNTD_RPCPORT,nfsprog=$NFSD_RPCPORT,udp,port=$NFSD_PORT,mountport=$MOUNTD_PORT"
283 283
284 PSEUDO_LOCALSTATEDIR=~/.runqemu-sdk/pseudo 284 PSEUDO_LOCALSTATEDIR=~/.runqemu-sdk/pseudo