rpms/dhcp/devel dhcp.spec, 1.183, 1.184 dhcpd.init, 1.21, 1.22 dhcrelay.init, 1.6, 1.7

[David Cantrell (dcantrel)]

Author: dcantrel

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

Modified Files:
	dhcp.spec dhcpd.init dhcrelay.init 
Log Message:
* Thu Nov 15 2007 David Cantrell <dcantrell at redhat.com> - 12:3.1.0-9
- Fix chkconfig lines in dhcpd and dhcrelay init scripts (#384431)
- Improve postun scriptlet



Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- dhcp.spec	12 Nov 2007 23:16:08 -0000	1.183
+++ dhcp.spec	15 Nov 2007 18:34:00 -0000	1.184
@@ -13,7 +13,7 @@
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Name:     dhcp
 Version:  3.1.0
-Release:  8%{?dist}
+Release:  9%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer made
 # incorrect use of the epoch and that's why it is at 12 now.  It should have
 # never been used, but it was.  So we are stuck with it.
@@ -355,15 +355,18 @@
 %clean
 %{__rm} -rf %{buildroot}
 
-%post
-# This adds the proper /etc/rc*.d links for the script
-/sbin/chkconfig --add dhcpd
-/sbin/chkconfig --add dhcrelay
-
 %preun
 if [ $1 = 0 ]; then
-    /sbin/service dhcpd stop >/dev/null 2>&1 || :
-    /sbin/service dhcrelay stop >/dev/null 2>&1 || :
+    /sbin/service dhcpd status >/dev/null 2>&1
+    if [ $? = 3 ]; then
+        /sbin/service dhcpd stop >/dev/null 2>&1 || :
+    fi
+
+    /sbin/service dhcrelay status >/dev/null 2>&1
+    if [ $? = 3 ]; then
+        /sbin/service dhcrelay stop >/dev/null 2>&1 || :
+    fi
+
     /sbin/chkconfig --del dhcpd
     /sbin/chkconfig --del dhcrelay
 fi
@@ -440,6 +443,10 @@
 %{_libdir}/libdhcp4client.a
 
 %changelog
+* Thu Nov 15 2007 David Cantrell <dcantrell at redhat.com> - 12:3.1.0-9
+- Fix chkconfig lines in dhcpd and dhcrelay init scripts (#384431)
+- Improve postun scriptlet
+
 * Mon Nov 12 2007 David Cantrell <dcantrell at redhat.com> - 12:3.1.0-8
 - Put dhcp.schema in /etc/openldap/schema (#330471)
 - Remove manpages patch and keep modified man pages as Source files


Index: dhcpd.init
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcpd.init,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- dhcpd.init	12 Nov 2007 23:16:08 -0000	1.21
+++ dhcpd.init	15 Nov 2007 18:34:00 -0000	1.22
@@ -14,7 +14,7 @@
 #
 # The fields below are left around for legacy tools (will remove later).
 #
-# chkconfig: -
+# chkconfig: - 65 35
 # description: dhcpd provides the Dynamic Host Configuration Protocol (DHCP) \
 #              server
 # processname: dhcpd


Index: dhcrelay.init
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcrelay.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dhcrelay.init	12 Nov 2007 23:16:08 -0000	1.6
+++ dhcrelay.init	15 Nov 2007 18:34:00 -0000	1.7
@@ -15,7 +15,7 @@
 #
 # The fields below are left around for legacy tools (will remove later).
 #
-# chkconfig: -
+# chkconfig: - 65 35
 # description: dhcrelay provides a relay for Dynamic Host Control Protocol.
 # processname: dhcrelay
 # # pidfile: /var/run/dhcrelay.pid