From 7803c496664d34c64fc90bbf8404049e9a70e52f Mon Sep 17 00:00:00 2001
From: David Cantrell <dcantrel@fedoraproject.org>
Date: Wed, 24 Oct 2007 17:47:43 +0000
Subject: [PATCH] - Fix 'restart' mode in init script (#349341)

---
 dhcp.spec  | 5 ++++-
 dhcpd.init | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dhcp.spec b/dhcp.spec
index 11cf4e4..a0f4d97 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -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 @@ fi
 %{_libdir}/libdhcp4client.a
 
 %changelog
+* Wed Oct 23 2007 David Cantrell <dcantrell@redhat.com> - 12:3.1.0-2
+- Fix 'restart' mode in init script (#349341)
+
 * Tue Oct 23 2007 David Cantrell <dcantrell@redhat.com> - 12:3.1.0-1
 - Upgrade to ISC dhcp-3.1.0
 - Remove unnecessary /usr/include/dhcp4client/isc_dhcp headers
diff --git a/dhcpd.init b/dhcpd.init
index 97c6da6..ce29a5c 100644
--- a/dhcpd.init
+++ b/dhcpd.init
@@ -117,7 +117,7 @@ case "$1" in
         RETVAL=$?
         ;;
     restart|force-reload)
-        stop && start
+        stop ; start
         RETVAL=$?
         ;;
     try-restart|reload)
@@ -125,7 +125,7 @@ case "$1" in
         ;;
     condrestart)
         if [ -f $lockfile ]; then
-            stop && start
+            stop ; start
             RETVAL=$?
         fi
         ;;