X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=nfs.init;h=0da6062e1f467d2d9646c2c351f8981f3c2033ae;hb=5406419cd9a89792318c41211eb4cd848e1a32e8;hp=dc2d880cb2736ffb50019c10c7333d28b77acdbd;hpb=2da61068e18ed17a21d699313f9b07fdcfed8757;p=packages%2Fnfs-utils.git

diff --git a/nfs.init b/nfs.init
index dc2d880..0da6062 100644
--- a/nfs.init
+++ b/nfs.init
@@ -3,7 +3,7 @@
 # nfs		This shell script takes care of starting and stopping
 #		the NFS services.
 #
-# chkconfig:	345 60 20
+# chkconfig:	345 13 81
 # description:	NFS is a popular protocol for file sharing across TCP/IP \
 #		networks. This service provides NFS server functionality, \
 #		which is configured via the /etc/exports file.
@@ -15,119 +15,110 @@
 # Get network config
 . /etc/sysconfig/network
 
-# Get service config
+# Get service configs
+[ -f /etc/sysconfig/nfslock ] && . /etc/sysconfig/nfslock
 [ -f /etc/sysconfig/nfsd ] && . /etc/sysconfig/nfsd
 
+[ -n "$NFSv1" ] || NFSv1="yes"
+[ -n "$NFSv2" ] || NFSv2="yes"
+[ -n "$NFSv3" ] || NFSv3="yes"
+[ -n "$NFSv4" ] || NFSv4="yes"
+
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
 	if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
-		msg_network_down NFSD
+		msg_network_down "NFS daemon"
 		exit 1
 	fi
 else
 	exit 0
 fi
 
-if [ -x /sbin/pidof ] && [ "$1" != "stop" ]; then
-	[ -z "`/sbin/pidof portmap`" ] && nls "Error: portmap isn't running" && exit 0
-fi
-
-# Sanity checks
-[ -x /usr/sbin/rpc.nfsd ] || exit 0
-[ -x /usr/sbin/rpc.mountd ] || exit 0
-[ -f /etc/exports ] || exit 0
-
-if ! is_yes "$NFS4" ; then
-	RPCMOUNTOPTIONS="$RPCMOUNTOPTIONS --no-nfs-version 4"
+if [ "$1" != "stop" ]; then
+	check_portmapper || { nls "Error: portmap isn't running" && exit 0; }
 fi
 
-RETVAL=0
-# See how we were called.
-case "$1" in
-  start)
+start() {
 	# Check if the service is already running?
 	if [ ! -f /var/lock/subsys/nfs ]; then
-		# Start daemons.
-		modprobe -s nfsd > /dev/null 2>&1
-		if [ "$(kernelverser)" -ge "002006" ]; then
-		    grep -q nfsd /proc/filesystems && \
-		    ! grep -q nfsd /proc/mounts && \
+		if ! grep -q nfsd /proc/mounts ; then
+			modprobe -s nfsd > /dev/null 2>&1
 			run_cmd "Mounting /proc/fs/nfsd filesystem" mount -t nfsd nfsd /proc/fs/nfsd
 		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
+		fi
+		if [ -n "$LOCKD_UDPPORT" ]; then
+			/sbin/sysctl -w fs.nfs.nlm_udpport=$LOCKD_UDPPORT >/dev/null 2>&1
+		fi
+
+		for vers in 1 2 3 4 ; do
+			is_yes $(eval echo \$NFSv$vers) || \
+				RPCMOUNTOPTIONS="$RPCMOUNTOPTIONS --no-nfs-version $vers"
+		done
+
+		[ -n "$MOUNTD_PORT" ] && RPCMOUNTOPTIONS="$RPCMOUNTOPTIONS -p $MOUNTD_PORT"
+
+		# Start daemons.
 		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
-			! 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
 		touch /var/lock/subsys/nfs
 	else
-		msg_already_running "NFS"
+		msg_already_running "NFS daemon"
 	fi
-	;;
-  stop)
+}
+
+stop() {
 	if [ -f /var/lock/subsys/nfs ]; then
 		# Stop daemons.
-		msg_stopping "NFS mountd"
-		killproc rpc.mountd
 		msg_stopping "NFS daemon"
 		killproc nfsd -QUIT
-		if is_yes "$NFS4" ; then
-			if (grep -q rpc_pipefs /proc/filesystems); then
-			    msg_stopping "NFS svcgssd"
-			    killproc rpc.svcgssd
-			    if [ -f /var/lock/subsys/idmapd -a ! -f /var/lock/subsys/nfsfs ]; then
-				msg_stopping "NFS idmapd"
-				killproc rpc.idmapd
-				rm -f /var/lock/subsys/idmapd
-			    fi
-			fi
-		fi
+		msg_stopping "NFS mountd"
+		killproc rpc.mountd
 		msg_stopping "NFS"
 		daemon /usr/sbin/exportfs -au
 		rm -f /var/lock/subsys/nfs
 	else
 		msg_not_running "NFS"
 	fi
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+  	start
 	;;
-  status)
-	status rpc.mountd
-	RETVAL=$?
-	status nfsd
-	RET=$?
-	[ $RETVAL -eq 0 ] && RETVAL=$RET
+  stop)
+  	stop
 	;;
   restart)
-	$0 stop
-	$0 start
-	exit $?
-	;;
-  force-reload)
-	$0 reload
-	exit $?
+	stop
+	start
+	/sbin/service idmapd status >/dev/null && /sbin/service idmapd reload
+	/sbin/service svcgssd status >/dev/null && /sbin/service svcgssd restart
 	;;
-  reload)
+  reload|force-reload)
 	if [ -f /var/lock/subsys/nfs ]; then
 		msg_reloading "NFS"
 		busy
-		/usr/sbin/exportfs
+		/usr/sbin/exportfs -r
 		[ $? -ne 0 ] && RETVAL=7
-		[ $RETVAL -eq 0 ] && ok || died
+		if [ $RETVAL -eq 0 ]; then
+			ok
+			/sbin/service idmapd status >/dev/null && /sbin/service idmapd reload
+			/sbin/service svcgssd status >/dev/null && /sbin/service svcgssd restart
+		else
+			died
+		fi
 	else
-		msg_not_running "NFS" >&2
+		msg_not_running "NFS"
 		exit 7
 	fi
 	;;
@@ -147,6 +138,19 @@ case "$1" in
 		exit 0
 	fi
 	;;
+  status)
+	echo "Configured NFS exports:"
+	grep -v "^#" /etc/exports
+	echo
+	echo "Active NFS exports:"
+	/usr/sbin/exportfs -v
+	echo
+	status rpc.mountd
+	RETVAL=$?
+	status nfsd
+	RET=$?
+	[ $RETVAL -eq 0 ] && RETVAL=$RET
+	;;
   *)
 	msg_usage "$0 {start|stop|restart|reload|force-reload|probe|status}"
 	exit 3