rpms/bind/devel bind.spec,1.193,1.194 named.init,1.54,1.55

[Adam Tkac (atkac)]

Author: atkac

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19748

Modified Files:
	bind.spec named.init 
Log Message:
initscript is ready for parallel booting (#246878)



Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- bind.spec	17 Jul 2007 06:09:36 -0000	1.193
+++ bind.spec	17 Jul 2007 10:48:09 -0000	1.194
@@ -16,7 +16,7 @@
 Name: 		bind
 License: 	BSD-like
 Version: 	9.5.0a5
-Release: 	3%{?dist}
+Release: 	3.2%{?dist}
 Epoch:   	31
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -465,7 +465,7 @@
 %postun
 /sbin/ldconfig
 if [ "$1" -ge 1 ]; then
-   /sbin/service named condrestart >/dev/null 2>&1 || :;
+   /sbin/service named try-restart >/dev/null 2>&1 || :;
 fi;
 :;
 
@@ -703,6 +703,9 @@
 %endif
 
 %changelog
+* Tue Jul 17 2007 Adam Tkac <atkac redhat com> 31:9.5.0a5-3.2.fc8
+- initscript should be ready for parallel booting (#246878)
+
 * Tue Jul 17 2007 Adam Tkac <atkac redhat com> 31:9.5.0a5-3.fc8
 - handle integer overflow in isc_time_secondsastimet function gracefully (#247856)
 


Index: named.init
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/named.init,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- named.init	18 Jun 2007 12:40:28 -0000	1.54
+++ named.init	17 Jul 2007 10:48:09 -0000	1.55
@@ -8,14 +8,15 @@
 # that is used to resolve host names to IP addresses.
 # probe: true
 
-# Return codes
-# - script (all except status command)
-#   - 2 invalid or excess argument(s)
-#   - 3 unimplemented feature (for example, "reload")
-#   - 4 user had insufficient privilege
-#   - 5 program is not installed
-#   - 6 program is not configured
-#   - 7 program is not running
+### BEGIN INIT INFO
+# Provides: $named
+# Required-Start: $local_fs $network $syslog
+# Required-Stop: $local_fs $network $syslog
+# Default-Start: 3 5
+# Default-Stop: 0 1 2 4 6
+# Short-Description: start|stop|status|restart|try-restart|reload|force-reload DNS server
+# Description: control ISC BIND implementation of DNS server
+### END INIT INFO
 
 # Source function library.
 . /etc/rc.d/init.d/functions
@@ -47,6 +48,7 @@
     dbusEnabled=1;
   fi;
 done
+
 if [ -z $dbusEnabled ] && [ -z "$DISABLE_NAMED_DBUS" ] ; then
   for l in 0 1 2 3 4 5 6; do
     if /sbin/chkconfig --level=$l NetworkManager >/dev/null 2>&1; then
@@ -243,13 +245,20 @@
 		restart
 		;;
 	condrestart)
+		echo "condrestart option is obsolete. Use try-restart instead"
 		if [ -e /var/lock/subsys/named ]; then restart; fi
 		;;
+	try-restart)
+		if [ -e /var/lock/subsys/named ]; then restart; fi
+                ;;
 	reload)
 		reload
 		;;
+	force-reload)
+		if ! reload; then restart; fi
+		;;
 	*)
-        	echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
+        	echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
 		exit 3
 esac