SOURCES (AC-branch): nfs.init - mount rpc_pipefs only when nfsv4 i...

[baggins]

Author: baggins                      Date: Mon May  8 14:56:32 2006 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- mount rpc_pipefs only when nfsv4 is requested

---- Files affected:
SOURCES:
   nfs.init (1.22.2.4 -> 1.22.2.5) 

---- Diffs:

================================================================
Index: SOURCES/nfs.init
diff -u SOURCES/nfs.init:1.22.2.4 SOURCES/nfs.init:1.22.2.5
--- SOURCES/nfs.init:1.22.2.4	Mon May  8 16:16:00 2006
+++ SOURCES/nfs.init	Mon May  8 16:56:27 2006
@@ -53,24 +53,23 @@
 		    grep -q nfsd /proc/filesystems && \
 		    ! grep -q nfsd /proc/mounts && \
 			run_cmd "Mounting /proc/fs/nfsd filesystem" mount -t nfsd nfsd /proc/fs/nfsd
-		    grep -q rpc_pipefs /proc/filesystems && \
-		    ! grep -q rpc_pipefs /proc/mounts && \
-			run_cmd "Mounting /var/lib/nfs/rpc_pipefs filesystem" mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
 		fi
 		msg_starting "NFS exportfs"
 		daemon /usr/sbin/exportfs -r
 		msg_starting "NFS mountd"
 		daemon rpc.mountd $RPCMOUNTOPTIONS
 		if is_yes "$NFS4" ; then
-			if (grep -q rpc_pipefs /proc/filesystems); then
-			    if [ ! -f /var/lock/subsys/idmapd ]; then
-				msg_starting "NFS idmapd"
-				daemon rpc.idmapd $RPCIDMAPOPTIONS
-				[ $? = 0 ] && touch /var/lock/subsys/idmapd
-			    fi
-			    msg_starting "NFS svcgssd"
-			    daemon rpc.svcgssd $RPCSVCGSSOPTIONS
+		    if (grep -q rpc_pipefs /proc/filesystems); then
+			! grep -q rpc_pipefs /proc/mounts && \
+			    run_cmd "Mounting /var/lib/nfs/rpc_pipefs filesystem" mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
+			if [ ! -f /var/lock/subsys/idmapd ]; then
+			    msg_starting "NFS idmapd"
+			    daemon rpc.idmapd $RPCIDMAPOPTIONS
+			    [ $? = 0 ] && touch /var/lock/subsys/idmapd
 			fi
+			msg_starting "NFS svcgssd"
+			daemon rpc.svcgssd $RPCSVCGSSOPTIONS
+		    fi
 		fi
 		msg_starting "NFS daemon"
 		daemon rpc.nfsd $RPCNFSDCOUNT
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/nfs.init?r1=1.22.2.4&r2=1.22.2.5&f=u