[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6243/8267] runqemu-export-rootfs: don't change RPC ports

[Emmanuele Bassi <ebassi src gnome org>]

commit 6bb9860ef7ba9c84fe9bd3a81aa6555f67ebd38e
Author: Cody P Schafer <dev codyps com>
Date:   Tue Jun 6 18:30:49 2017 -0400

    runqemu-export-rootfs: don't change RPC ports
    
    RPC ports (also known as rpc program numbers) are values:
    
     - given to rpcbind (aka portmapper) to allow nfsv3 clients that don't
       know the tcp/udp port number of nfsd and mountd to look it up the
       tcp/udp port number, and to
    
     - allow a single transport (ie: tcp/udp port) to provide multiple
       sunrpc services.
    
    OE has carried patches to nfsutils & linux for some time to support the
    mountprog & nfsprog options.
    
    In the case of runqemu-export-rootfs, we don't need to use custom rpc
    program numbers because runqemu-export-rootfs tells unfsd not to
    register with the portmapper, and unfsd runs the nfs and mount rpc
    services on tcp/udp ports unfsd binds itself (iow: the tcp/udp ports are
    not shared in the sunrpc sense).
    
    Linux's nfs client does not query rpcbind when tcp/udp port numbers are
    specified (in net/sunrpc/clnt.c, call_bind checks for the tcp/udp port
    with xprt_bound() and skips the call to rpcbind if xprtsock.c's
    xs_setup_udp() or xs_setup_tcp() has found a non-zero tcp/udp port).
    
    The program numbers _are_ sent over the mount & nfs protocol (really,
    over sunrpc), and checked to match at both ends. As a result, even when
    rpcbind is unused, using different program numbers in unfsd vs linux
    nfs client causes mounts to fail (and nfsroot mounts to timeout).
    
    The result is that specifying custom program numbers in
    runqemu-export-rootfs doesn't solve any conflicts, it simply requires
    that users of runqemu-export-rootfs carry a kernel patch & adds 2 extra
    parameters to the kernel command line unnecessarily.
    
    Change runqemu-export-rootfs to use the default program numbers.
    
    For now, I have not dropped the custom program number patches to linux,
    nfs-utils, and unfsd just in case someone is using them in a
    non-runqemu-export-rootfs context.
    
    CC: Bruce Ashfield <bruce ashfield gmail com>
    CC: Mark Hatle <mark hatle windriver com>
    (From OE-Core rev: 9c91df324dfe58273f5a1d1d33dba1d34a180db7)
    
    Signed-off-by: Cody P Schafer <dev codyps com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/runqemu-export-rootfs |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/scripts/runqemu-export-rootfs b/scripts/runqemu-export-rootfs
index c7992d8..70cdcdb 100755
--- a/scripts/runqemu-export-rootfs
+++ b/scripts/runqemu-export-rootfs
@@ -77,10 +77,6 @@ if [ ! -d "$PSEUDO_LOCALSTATEDIR" ]; then
        exit 1  
 fi
 
-# rpc.mountd RPC port
-MOUNTD_RPCPORT=${MOUNTD_RPCPORT:=$[ 21111 + $NFS_INSTANCE ]}
-# rpc.nfsd RPC port
-NFSD_RPCPORT=${NFSD_RPCPORT:=$[ 11111 + $NFS_INSTANCE ]}
 # NFS server port number
 NFSD_PORT=${NFSD_PORT:=$[ 3049 + 2 * $NFS_INSTANCE ]}
 # mountd port number
@@ -88,7 +84,7 @@ MOUNTD_PORT=${MOUNTD_PORT:=$[ 3048 + 2 * $NFS_INSTANCE ]}
 
 ## For debugging you would additionally add
 ## --debug all
-UNFSD_OPTS="-p -N -i $NFSPID -e $EXPORTS -x $NFSD_RPCPORT -n $NFSD_PORT -y $MOUNTD_RPCPORT -m $MOUNTD_PORT"
+UNFSD_OPTS="-p -N -i $NFSPID -e $EXPORTS -n $NFSD_PORT -m $MOUNTD_PORT"
 
 # See how we were called.
 case "$1" in
@@ -130,7 +126,7 @@ case "$1" in
        fi
        echo " "
        echo "On your target please remember to add the following options for NFS"
-       echo 
"nfsroot=IP_ADDRESS:$NFS_EXPORT_DIR,nfsvers=3,port=$NFSD_PORT,mountprog=$MOUNTD_RPCPORT,nfsprog=$NFSD_RPCPORT,udp,mountport=$MOUNTD_PORT"
+       echo "nfsroot=IP_ADDRESS:$NFS_EXPORT_DIR,nfsvers=3,port=$NFSD_PORT,udp,mountport=$MOUNTD_PORT"
        ;;
   stop)
        if [ -f "$NFSPID" ]; then