Fix a typo.

[nfs-utils.git] / etc / redhat / nfs.init

diff --git a/etc/redhat/nfs.init b/etc/redhat/nfs.init
index 687b19904be2d57383a6c54be49daa2e39d27973..c1b98eab3634f96b47c340908d9a9ab61ef08418 100755 (executable)
--- a/etc/redhat/nfs.init
+++ b/etc/redhat/nfs.init
@@ -27,10 +27,10 @@ fi
 [ -x /usr/sbin/exportfs ] || exit 0
 [ -s /etc/exports ] || exit 0
 
-# Number of servers to be started uo by default
+# Number of servers to be started up by default
 RPCNFSDCOUNT=8
-# No NFS V3.
-RPCMOUNTDOPTS="--no-nfs-version 3"
+# Default to NFS version 3.
+RPCMOUNTDOPTS=""
 
 # See how we were called.
 case "$1" in
@@ -40,12 +40,25 @@ case "$1" in
        echo -n "Starting NFS quotas: "
        daemon rpc.rquotad
        echo
-       echo -n "Starting NFS mountd: "
-       daemon rpc.mountd $RPCMOUNTDOPTS
-       echo
        echo -n "Starting NFS daemon: "
        daemon rpc.nfsd $RPCNFSDCOUNT
        echo
+
+       # Let's see if we support NFS version 3.
+       /usr/sbin/rpcinfo -u localhost nfs 3 &>/dev/null
+       if [ $? -ne 0 ]; then
+               RPCMOUNTDOPTS="--no-nfs-version 3"
+       fi
+
+       # Let's see if we support NFS over TCP.
+       /usr/sbin/rpcinfo -p localhost | grep nfs | grep tcp &>/dev/null
+       if [ $? -ne 0 ]; then
+               RPCMOUNTDOPTS="$RPCMOUNTDOPTS --no-tcp"
+       fi
+
+       echo -n "Starting NFS mountd: "
+       daemon rpc.mountd $RPCMOUNTDOPTS
+       echo
        touch /var/lock/subsys/nfs
        ;;
   stop)
@@ -59,6 +72,8 @@ case "$1" in
        echo -n "Shutting down NFS quotas: "
        killproc rpc.rquotad
        echo
+       # Do it the last so that clients can still access the server
+       # when the server is running.
        action "Shutting down NFS services: " /usr/sbin/exportfs -au
        rm -f /var/lock/subsys/nfs
        ;;
@@ -68,13 +83,8 @@ case "$1" in
        status rpc.rquotad
        ;;
   restart)
-       echo -n "Restarting NFS services: "
-       echo -n "rpc.mountd "
-       killproc rpc.mountd
-       daemon rpc.mountd $RPCMOUNTDOPTS
-       /usr/sbin/exportfs -r
-       touch /var/lock/subsys/nfs
-       echo "done."
+       $0 stop
+       $0 start
        ;;
   reload)
        /usr/sbin/exportfs -r
@@ -99,4 +109,3 @@ case "$1" in
 esac
 
 exit 0
-