Fix iprange usage when configuring DHCP clients

[grml-terminalserver.git] / nfs-kernel-server

diff --git a/nfs-kernel-server b/nfs-kernel-server
index 253514a..9c2e2aa 100755 (executable)
--- 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 \