rpms/dhcp/F-8 dhcp.spec,1.174,1.175 dhcpd.init,1.18,1.19

[David Cantrell (dcantrel)]

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5414

Modified Files:
	dhcp.spec dhcpd.init 
Log Message:
* Wed Oct 24 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.6-10
- Fix 'restart' mode in init script (#349341)
- Make sure restorecon is run on /var/lib/dhcpd/dhcpd.leases (#251688)



Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-8/dhcp.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- dhcp.spec	23 Oct 2007 21:14:20 -0000	1.174
+++ dhcp.spec	24 Oct 2007 17:54:05 -0000	1.175
@@ -13,7 +13,7 @@
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Name:     dhcp
 Version:  3.0.6
-Release:  9%{?dist}
+Release:  10%{?dist}
 Epoch:    12
 License:  ISC
 Group:    System Environment/Daemons
@@ -432,6 +432,10 @@
 %{_libdir}/libdhcp4client.a
 
 %changelog
+* Wed Oct 24 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.6-10
+- Fix 'restart' mode in init script (#349341)
+- Make sure restorecon is run on /var/lib/dhcpd/dhcpd.leases (#251688)
+
 * Tue Oct 23 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.6-9
 - Add missing /etc/openldap/dhcp.schema file (#330471)
 


Index: dhcpd.init
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-8/dhcpd.init,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- dhcpd.init	8 Oct 2007 17:58:17 -0000	1.18
+++ dhcpd.init	24 Oct 2007 17:54:05 -0000	1.19
@@ -53,7 +53,7 @@
 if [ ! -f /var/lib/dhcpd/dhcpd.leases ] ; then
     mkdir -p /var/lib/dhcpd
     touch /var/lib/dhcpd/dhcpd.leases
-    [ -x /sbin/restorecon ] && [ -d /selinux ] && /sbin/restorecon /var/lib/dhcp/dhcpd.leases >/dev/null 2>&1
+    [ -x /sbin/restorecon ] && [ -d /selinux ] && /sbin/restorecon /var/lib/dhcpd/dhcpd.leases >/dev/null 2>&1
 fi
 
 configtest() {
@@ -117,7 +117,7 @@
         RETVAL=$?
         ;;
     restart|force-reload)
-        stop && start
+        stop ; start
         RETVAL=$?
         ;;
     try-restart|reload)
@@ -125,7 +125,7 @@
         ;;
     condrestart)
         if [ -f $lockfile ]; then
-            stop && start
+            stop ; start
             RETVAL=$?
         fi
         ;;