summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-11-23 00:00:18 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-19 22:47:20 +0000
commitdcaeaf2df160163319a05f5ae23e4ada6b64ca4e (patch)
tree2180d6dcea99c8efb5ebd98938837447142db235 /scripts
parent65a8d4d185e7456fae020326641e8c1e404ea689 (diff)
downloadpoky-dcaeaf2df160163319a05f5ae23e4ada6b64ca4e.tar.gz
runqemu-export-rootfs: fix inconsistent var names
Fixed: $ runqemu nfs qemux86-64 [snip] On your target please remember to add the following options for NFS nfsroot=IP_ADDRESS:/path/to/nfsroot,nfsvers=3,port=,mountprog=,nfsprog=,udp,mountport= [snip] Note that the values are null, this is because their var names are inconsistent. [YOCTO #10519] (From OE-Core rev: 10c136a382006c0ec2679a70f47ff2446c10372c) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/runqemu-export-rootfs21
1 files changed, 9 insertions, 12 deletions
diff --git a/scripts/runqemu-export-rootfs b/scripts/runqemu-export-rootfs
index 3dee131166..0dd3eba8b6 100755
--- a/scripts/runqemu-export-rootfs
+++ b/scripts/runqemu-export-rootfs
@@ -78,23 +78,17 @@ if [ ! -d "$PSEUDO_LOCALSTATEDIR" ]; then
78fi 78fi
79 79
80# rpc.mountd RPC port 80# rpc.mountd RPC port
81NFS_MOUNTPROG=$[ 21111 + $NFS_INSTANCE ] 81MOUNTD_RPCPORT=$[ 21111 + $NFS_INSTANCE ]
82# rpc.nfsd RPC port 82# rpc.nfsd RPC port
83NFS_NFSPROG=$[ 11111 + $NFS_INSTANCE ] 83NFSD_RPCPORT=$[ 11111 + $NFS_INSTANCE ]
84# NFS port number 84# NFS server port number
85NFS_PORT=$[ 3049 + 2 * $NFS_INSTANCE ] 85NFSD_PORT=$[ 3049 + 2 * $NFS_INSTANCE ]
86# mountd port number 86# mountd port number
87MOUNT_PORT=$[ 3048 + 2 * $NFS_INSTANCE ] 87MOUNTD_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
91UNFSD_OPTS="-p -N -i $NFSPID -e $EXPORTS -x $NFS_NFSPROG -n $NFS_PORT -y $NFS_MOUNTPROG -m $MOUNT_PORT" 91UNFSD_OPTS="-p -N -i $NFSPID -e $EXPORTS -x $NFSD_RPCPORT -n $NFSD_PORT -y $MOUNTD_RPCPORT -m $MOUNTD_PORT"
92
93# Setup the exports file
94if [ "$1" = "start" ]; then
95 echo "Creating exports file..."
96 echo "$NFS_EXPORT_DIR (rw,async,no_root_squash,no_all_squash,insecure)" > $EXPORTS
97fi
98 92
99# See how we were called. 93# See how we were called.
100case "$1" in 94case "$1" in
@@ -114,6 +108,9 @@ case "$1" in
114 exit 1 108 exit 1
115 fi 109 fi
116 110
111 echo "Creating exports file..."
112 echo "$NFS_EXPORT_DIR (rw,async,no_root_squash,no_all_squash,insecure)" > $EXPORTS
113
117 echo "Starting User Mode nfsd" 114 echo "Starting User Mode nfsd"
118 echo " $PSEUDO $PSEUDO_OPTS $OECORE_NATIVE_SYSROOT/usr/bin/unfsd $UNFSD_OPTS" 115 echo " $PSEUDO $PSEUDO_OPTS $OECORE_NATIVE_SYSROOT/usr/bin/unfsd $UNFSD_OPTS"
119 $PSEUDO $PSEUDO_OPTS $OECORE_NATIVE_SYSROOT/usr/bin/unfsd $UNFSD_OPTS 116 $PSEUDO $PSEUDO_OPTS $OECORE_NATIVE_SYSROOT/usr/bin/unfsd $UNFSD_OPTS