From: Jan Rękorajski <baggins@pld-linux.org>
Date: Thu, 29 Mar 2007 12:57:56 +0000 (+0000)
Subject: - start mountd before nfsd, from Neil Brown:
X-Git-Tag: auto/th/nfs-utils-1_0_12-8_4~9
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=4a5264794c354c22460316c6e49c5be858e94ea3;p=packages%2Fnfs-utils.git

- start mountd before nfsd, from Neil Brown:
  - mountd should start before nfsd.
  - mountd:
	provides "is this exported" service to nfsd.  If it isn't running
	when the first nfs request arrives, it might be rejected
	incorrectly.  This is probably the second most important
	dependency.
- start/restart svcgssd also (looks like it can misbehave just like idmapd)

Changed files:
    nfs.init -> 1.43
---

diff --git a/nfs.init b/nfs.init
index a2f9fb1..62d2de7 100644
--- a/nfs.init
+++ b/nfs.init
@@ -64,10 +64,10 @@ start() {
 		# Start daemons.
 		msg_starting "NFS exportfs"
 		daemon /usr/sbin/exportfs -r
-		msg_starting "NFS daemon"
-		daemon rpc.nfsd $RPCNFSDCOUNT
 		msg_starting "NFS mountd"
 		daemon rpc.mountd $RPCMOUNTOPTIONS
+		msg_starting "NFS daemon"
+		daemon rpc.nfsd $RPCNFSDCOUNT
 		touch /var/lock/subsys/nfs
 	else
 		msg_already_running "NFS daemon"
@@ -77,10 +77,10 @@ start() {
 stop() {
 	if [ -f /var/lock/subsys/nfs ]; then
 		# Stop daemons.
-		msg_stopping "NFS mountd"
-		killproc rpc.mountd
 		msg_stopping "NFS daemon"
 		killproc nfsd -QUIT
+		msg_stopping "NFS mountd"
+		killproc rpc.mountd
 		msg_stopping "NFS"
 		daemon /usr/sbin/exportfs -au
 		rm -f /var/lock/subsys/nfs
@@ -102,6 +102,7 @@ case "$1" in
 	stop
 	start
 	/sbin/service idmapd status >/dev/null && /sbin/service idmapd restart
+	/sbin/service svcgssd status >/dev/null && /sbin/service svcgssd restart
 	;;
   reload|force-reload)
 	if [ -f /var/lock/subsys/nfs ]; then
@@ -109,8 +110,13 @@ case "$1" in
 		busy
 		/usr/sbin/exportfs -r
 		[ $? -ne 0 ] && RETVAL=7
-		[ $RETVAL -eq 0 ] && ok || died
-		/sbin/service idmapd status >/dev/null && /sbin/service idmapd restart
+		if [ $RETVAL -eq 0 ]; then
+			ok
+			/sbin/service idmapd status >/dev/null && /sbin/service idmapd restart
+			/sbin/service svcgssd status >/dev/null && /sbin/service svcgssd restart
+		else
+			died
+		fi
 	else
 		msg_not_running "NFS"
 		exit 7