- no need to mount rpc_pipefs here, idmapd will do/already did it for us

[packages/nfs-utils.git] / nfsfs.init

diff --git a/nfsfs.init b/nfsfs.init
index 3caa0849ae9f9599c90784a68e384472b49e1651..53b2b07f10d8c4906e33c8a8ca43afbfbe2fbaaa 100644 (file)
--- a/nfsfs.init
+++ b/nfsfs.init
@@ -6,7 +6,7 @@
 #
 # Author:      Miquel van Smoorenburg, <miquels@drinkel.nl.mugnet.org>
 #
-# chkconfig:   345 15 83
+# chkconfig:   345 16 80
 # description: Mounts and unmounts all Network File System (NFS) \
 #              mount points.
 #
@@ -43,12 +43,6 @@ fi
 
 start() {
        if [ ! -f /var/lock/subsys/nfsfs ]; then
-               if ! grep -q rpc_pipefs /proc/mounts ; then
-                       modprobe -s sunrpc > /dev/null 2>&1
-                       run_cmd "Mounting /var/lib/nfs/rpc_pipefs filesystem" \
-                               mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
-               fi
-
                # Set the ports lockd should listen on
                if [ -n "$LOCKD_TCPPORT" ]; then
                        /sbin/sysctl -w fs.nfs.nlm_tcpport=$LOCKD_TCPPORT >/dev/null 2>&1
@@ -58,7 +52,7 @@ start() {
                fi
 
                # Special case /usr first
-               if awk '{ if ($2 == "/usr" && $3 ~ /^nfs(4$|$)/ && $4 !~ /noauto/) exit 1}' /etc/fstab ; then
+               if ! awk '{ if ($2 == "/usr" && $3 ~ /^nfs(4$|$)/ && $4 !~ /noauto/) exit 1}' /etc/fstab ; then
                        run_cmd "Mounting /usr filesystem" mount /usr
                        # In case of /usr over NFS idmapd, gssd and lockd may not start
                        # check if they're running and try to start them if not