rpms/dhcp/devel dhcp.spec,1.174,1.175 dhcpd.init,1.19,1.20

[David Cantrell (dcantrel)]

Author: dcantrel

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

Modified Files:
	dhcp.spec dhcpd.init 
Log Message:
* Wed Oct 23 2007 David Cantrell <dcantrell at redhat.com> - 12:3.1.0-2
- Fix 'restart' mode in init script (#349341)



Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- dhcp.spec	23 Oct 2007 18:28:01 -0000	1.174
+++ dhcp.spec	24 Oct 2007 17:47:43 -0000	1.175
@@ -13,7 +13,7 @@
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Name:     dhcp
 Version:  3.1.0
-Release:  1%{?dist}
+Release:  2%{?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.
@@ -435,6 +435,9 @@
 %{_libdir}/libdhcp4client.a
 
 %changelog
+* Wed Oct 23 2007 David Cantrell <dcantrell at redhat.com> - 12:3.1.0-2
+- Fix 'restart' mode in init script (#349341)
+
 * Tue Oct 23 2007 David Cantrell <dcantrell at redhat.com> - 12:3.1.0-1
 - Upgrade to ISC dhcp-3.1.0
 - Remove unnecessary /usr/include/dhcp4client/isc_dhcp headers


Index: dhcpd.init
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcpd.init,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- dhcpd.init	23 Oct 2007 18:28:01 -0000	1.19
+++ dhcpd.init	24 Oct 2007 17:47:43 -0000	1.20
@@ -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
         ;;