rpms/nsd/devel nsd.init,1.5,1.6

[Paul Wouters (pwouters)]

Author: pwouters

Update of /cvs/extras/rpms/nsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21190

Modified Files:
	nsd.init 
Log Message:
Fix pid file location. Remove NOTIFY state on stop.



Index: nsd.init
===================================================================
RCS file: /cvs/extras/rpms/nsd/devel/nsd.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nsd.init	27 Nov 2006 17:43:39 -0000	1.5
+++ nsd.init	14 Sep 2007 18:14:17 -0000	1.6
@@ -35,12 +35,13 @@
 
 start() {
 	/usr/sbin/nsdc rebuild >/dev/null
-	/usr/sbin/nsdc update >/dev/null
 	echo -n $"Starting nsd... "
 	nsd $OTHER_NSD_OPTS
 	RETVAL=$?
 	echo
-	/usr/sbin/nsdc notify
+	/usr/sbin/nsdc update >/dev/null 2> /dev/null
+	# nsd doesn't handle broken pri/sec servers very well
+	/usr/sbin/nsdc notify > /dev/null 2> /dev/null &
 	touch /var/lock/subsys/nsd
 	return $RETVAL
 }
@@ -50,8 +51,10 @@
 	killproc nsd
 	RETVAL=$?
 	if [ $RETVAL -eq 0 ] ; then
+	  rm -f /var/run/nsd/nsd.pid
+	  # ensure notifies are sent at startup
+	  rm -f /var/lib/nsd/xfrd.state
 	  rm -f /var/lock/subsys/nsd
-	  rm -f /var/run/nsd.pid
 	fi
 	echo
 	return $RETVAL