From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 11 Apr 2010 21:07:54 +0000 (+0000)
Subject: [package] fix killing and starting of dhcp (#6919)
X-Git-Url: http://git.archive.openwrt.org/?a=commitdiff_plain;h=f7b39a13eba6e4f13f5917062621f97b6bbc8c10;p=packages.git

[package] fix killing and starting of dhcp (#6919)

git-svn-id: svn://svn.openwrt.org/openwrt/packages@20814 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/net/dhcp/Makefile b/net/dhcp/Makefile
index 079e311fc..409adfc2d 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 c874552cc..c9ac1e308 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