summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/runqemu-export-rootfs4
-rwxr-xr-xscripts/runqemu-internal16
2 files changed, 8 insertions, 12 deletions
diff --git a/scripts/runqemu-export-rootfs b/scripts/runqemu-export-rootfs
index fec288accd..f8213ba4ef 100755
--- a/scripts/runqemu-export-rootfs
+++ b/scripts/runqemu-export-rootfs
@@ -83,10 +83,12 @@ NFS_MOUNTPROG=$[ 21111 + $NFS_INSTANCE ]
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 + $NFS_INSTANCE ]
86# mountd port number
87MOUNT_PORT=$[ 3048 + $NFS_INSTANCE ]
86 88
87## For debugging you would additionally add 89## For debugging you would additionally add
88## --debug all 90## --debug all
89MOUNTD_OPTS="--allow-non-root --mount-pid $MOUNTPID -f $EXPORTS --rmtab $RMTAB --prog $NFS_MOUNTPROG -r" 91MOUNTD_OPTS="--allow-non-root --mount-pid $MOUNTPID -f $EXPORTS --rmtab $RMTAB --prog $NFS_MOUNTPROG -r -P $MOUNT_PORT"
90NFSD_OPTS="--allow-non-root --nfs-pid $NFSPID -f $EXPORTS --prog $NFS_NFSPROG -P $NFS_PORT -r" 92NFSD_OPTS="--allow-non-root --nfs-pid $NFSPID -f $EXPORTS --prog $NFS_NFSPROG -P $NFS_PORT -r"
91 93
92# Setup the exports file 94# Setup the exports file
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index ce3291f3a9..2968ed939c 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -258,21 +258,15 @@ fi
258if [ "$FSTYPE" = "nfs" ]; then 258if [ "$FSTYPE" = "nfs" ]; then
259 NFS_SERVER="192.168.7.1" 259 NFS_SERVER="192.168.7.1"
260 NFS_DIR=`echo $ROOTFS | sed 's/^[^:]*:\(.*\)/\1/'` 260 NFS_DIR=`echo $ROOTFS | sed 's/^[^:]*:\(.*\)/\1/'`
261 MOUNTD_PORT=$[ 21111 + $NFS_INSTANCE ] 261 MOUNTD_RPCPORT=$[ 21111 + $NFS_INSTANCE ]
262 NFSD_PORT=$[ 11111 + $NFS_INSTANCE ] 262 NFSD_RPCPORT=$[ 11111 + $NFS_INSTANCE ]
263 UNFS_OPTS="nfsvers=2,mountprog=$MOUNTD_PORT,nfsprog=$NFSD_PORT,udp" 263 NFSD_PORT=$[ 3049 + $NFS_INSTANCE ]
264 MOUNTD_PORT=$[ 3048 + $NFS_INSTANCE ]
265 UNFS_OPTS="nfsvers=2,mountprog=$MOUNTD_RPCPORT,nfsprog=$NFSD_RPCPORT,udp,port=$NFSD_PORT,mountport=$MOUNTD_PORT"
264 266
265 PSEUDO_LOCALSTATEDIR=~/.runqemu-sdk/pseudo 267 PSEUDO_LOCALSTATEDIR=~/.runqemu-sdk/pseudo
266 export PSEUDO_LOCALSTATEDIR 268 export PSEUDO_LOCALSTATEDIR
267 269
268 rpcbind_running=`ps ax | grep rpcbind | grep -v grep | wc -l`
269 portmap_running=`ps ax | grep portmap | grep -v grep | wc -l`
270 if [[ $rpcbind_running == 0 && $portmap_running == 0 ]]; then
271 echo "You need to be running either rpcbind or portmap to continue"
272 cleanup
273 return
274 fi
275
276 # Start the userspace NFS server 270 # Start the userspace NFS server
277 echo "runqemu-export-rootfs restart $ROOTFS" 271 echo "runqemu-export-rootfs restart $ROOTFS"
278 runqemu-export-rootfs restart $ROOTFS 272 runqemu-export-rootfs restart $ROOTFS