X-Git-Url: http://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=nfs-kernel-server;h=9c2e2aa7c32364c6675bd2917e055f7b2942aa4c;hb=5334d11846eb7f0f763009abcecf64502e7a5e2c;hp=253514a522735edb9762c707bb84bfb250bd87cd;hpb=0696e9c985b9324d559845aa67642c7dcb020d54;p=grml-terminalserver.git

diff --git a/nfs-kernel-server b/nfs-kernel-server
index 253514a..9c2e2aa 100755
--- a/nfs-kernel-server
+++ b/nfs-kernel-server
@@ -69,7 +69,7 @@ case "$1" in
 		then
 		    printf " svcgssd"
 		    start-stop-daemon --start --quiet \
-			    --make-pidfile --pidfile /var/run/rpc.svcgssd.pid \
+			    --make-pidfile --pidfile /run/rpc.svcgssd.pid \
 			    --exec $PREFIX/sbin/rpc.svcgssd -- $RPCSVCGSSDOPTS
 		fi
 
@@ -89,7 +89,15 @@ case "$1" in
 		    }
 		fi
 
-		$PREFIX/bin/rpcinfo -u localhost nfs 3 >/dev/null 2>&1 ||
+		if [ -x $PREFIX/bin/rpcinfo ] ; then
+			RPCINFO=$PREFIX/bin/rpcinfo
+		elif [ -x $PREFIX/sbin/rpcinfo ] ; then
+			RPCINFO=$PREFIX/sbin/rpcinfo
+		else
+			echo "Error: could not locate rpcinfo binary." >&2
+			exit 1
+		fi
+		$RPCINFO -u localhost nfs 3 >/dev/null 2>&1 ||
 		    RPCMOUNTDOPTS="$RPCMOUNTDOPTS --no-nfs-version 3"
 
 		[ -z "$ClearAddr" ] || echo "nfsd 127.0.0.1 1" >/proc/net/rpc/auth.unix.ip/channel
@@ -111,7 +119,7 @@ case "$1" in
 	    printf " svcgssd"
 	    start-stop-daemon --stop --oknodo --quiet \
 		    --name rpc.svcgssd --user 0
-	    rm -f /var/run/rpc.svcgssd.pid
+	    rm -f /run/rpc.svcgssd.pid
 	fi
 	printf " nfsd"
 	start-stop-daemon --stop --oknodo --quiet \