X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=nfs.init;h=e3019b211b31db5f3cc89e443276b7085488b799;hb=dc4877f3076ae83af079dbf83d0d6990168051b9;hp=e13ca8f920b89899c98c49f8f3360ef8c2be4264;hpb=29066c696dfaa73bdae2f36ce5e5bb2fff0f1208;p=packages%2Fnfs-utils.git

diff --git a/nfs.init b/nfs.init
index e13ca8f..e3019b2 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,7 +15,8 @@
 # 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
 
 # Check that networking is up.
@@ -28,76 +29,54 @@ else
 	exit 0
 fi
 
+if [ "$1" != "stop" ]; then
+	check_portmapper || { nls "Error: portmap isn't running" && exit 0; }
+fi
+
 start() {
 	# Check if the service is already running?
-	if [ ! -f /var/lock/subsys/nfs ]; then
-		if [ -x /sbin/pidof ]; then
-			if [ -z "`/sbin/pidof portmap`" ]; then
-			   	nls "Error: portmap isn't running"
-			   	exit 0
-			fi
-		fi
-
-		if ! is_yes "$NFS4" ; then
-			RPCMOUNTOPTIONS="$RPCMOUNTOPTIONS --no-nfs-version 4"
-		fi
+	if [ -f /var/lock/subsys/nfs ]; then
+		msg_already_running "NFS daemon"
+		return
+	fi
 
-		# Start daemons.
+	if ! grep -q nfsd /proc/mounts ; then
 		modprobe -s nfsd > /dev/null 2>&1
-		if [ "$(kernelverser)" -ge "002006" ]; then
-		    grep -q nfsd /proc/filesystems && \
-		    ! grep -q nfsd /proc/mounts && \
-			run_cmd "Mounting /proc/fs/nfsd filesystem" mount -t nfsd nfsd /proc/fs/nfsd
-		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
-			! 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 daemon"
+		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
+
+	# Start daemons.
+	msg_starting "NFS exportfs"
+	daemon /usr/sbin/exportfs -r
+	msg_starting "NFS mountd"
+	daemon /usr/sbin/rpc.mountd $RPCMOUNTDOPTIONS
+	msg_starting "NFS daemon"
+	daemon /usr/sbin/rpc.nfsd $RPCNFSDCOUNT
+	touch /var/lock/subsys/nfs
 }
 
 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"
-		daemon /usr/sbin/exportfs -au
-		rm -f /var/lock/subsys/nfs
-	else
+	if [ ! -f /var/lock/subsys/nfs ]; then
 		msg_not_running "NFS"
+		return
 	fi
+
+	# Stop daemons.
+	msg_stopping "NFS daemon"
+	killproc nfsd -QUIT
+	msg_stopping "NFS mountd"
+	killproc rpc.mountd
+	msg_stopping "NFS exportfs"
+	daemon /usr/sbin/exportfs -au
+	rm -f /var/lock/subsys/nfs
 }
 
 RETVAL=0
@@ -112,14 +91,22 @@ case "$1" in
   restart)
 	stop
 	start
+	/sbin/service idmapd status >/dev/null && /sbin/service idmapd reload
+	/sbin/service svcgssd status >/dev/null && /sbin/service svcgssd restart
 	;;
   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"
 		exit 7
@@ -142,6 +129,12 @@ case "$1" in
 	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