From bb2a540e341ac53b63a3fd28b419b640403764a7 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Sun, 11 Apr 2010 21:07:54 +0000
Subject: [PATCH] [package] fix killing and starting of dhcp (#6919)

SVN-Revision: 20814
---
 net/dhcp/Makefile         | 2 +-
 net/dhcp/files/dhcpd.init | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/net/dhcp/Makefile b/net/dhcp/Makefile
index 079e311fca..409adfc2d8 100644
--- a/net/dhcp/Makefile
+++ b/net/dhcp/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dhcp
 PKG_VERSION:=3.1.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.isc.org/isc/dhcp/
diff --git a/net/dhcp/files/dhcpd.init b/net/dhcp/files/dhcpd.init
index c874552cc3..c9ac1e3084 100644
--- a/net/dhcp/files/dhcpd.init
+++ b/net/dhcp/files/dhcpd.init
@@ -6,6 +6,11 @@ config_file=/etc/dhcpd.conf
 pid_file=/var/run/dhcpd.pid
 
 start() {
+	if [ -e $pid_file ] ; then
+            echo "  dhcpd already running with PID `cat $pid_file`"
+    	    return 1
+        fi
+
 	echo Starting isc-dhcpd
 
 	if [ ! -e $lease_file ]; then
@@ -23,14 +28,14 @@ start() {
 stop() {
 	echo "Stopping isc-dhcpd"
 	if [ -e $pid_file ]; then
-		kill `cat $pid_file`
+		kill -KILL `cat $pid_file`
 
 		if [ $? -ne 0 ]; then
 			echo "  PID " `cat $pid_file` not found
 			echo "  Is the DHCP server running?"
 		fi
 	
-		rm $pid_file
+		rm -f $pid_file
 	else
 		echo "  $pid_file not found"
 	fi
-- 
2.30.2