Author: baggins Date: Thu Mar 29 12:58:01 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- 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)
---- Files affected:
SOURCES:
nfs.init (1.42 -> 1.43)
---- Diffs:
================================================================
Index: SOURCES/nfs.init
diff -u SOURCES/nfs.init:1.42 SOURCES/nfs.init:1.43
--- SOURCES/nfs.init:1.42 Mon Mar 26 00:34:13 2007
+++ SOURCES/nfs.init Thu Mar 29 14:57:56 2007
@@ -64,10 +64,10 @@
# 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 @@
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 @@
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 @@
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
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/nfs.init?r1=1.42&r2=1.43&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
