X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=src%2Finitscripts%2Finit.d%2Fdhcp;h=abc6b5c8f9ab82460475d5b8a610269e82851c82;hp=2da8d64dfc081726d4db84cd42ad420e4fd8a9f8;hb=42dbdb2088b7877ad1626d19db47089e07996b37;hpb=a2d5130fb5520cfc2896924d03663b608851bbeb

diff --git a/src/initscripts/init.d/dhcp b/src/initscripts/init.d/dhcp
index 2da8d64df..abc6b5c8f 100644
--- a/src/initscripts/init.d/dhcp
+++ b/src/initscripts/init.d/dhcp
@@ -16,7 +16,7 @@ case "$1" in
 			devices="${GREEN_DEV}"
 		fi
 		if [ -e /var/ipfire/dhcp/enable_blue ]; then
-			devices=+" ${BLUE_DEV}"
+			devices+=" ${BLUE_DEV}"
 			
 			iptables -A DHCPBLUEINPUT -p tcp --source-port 68 --destination-port 67 -i ${BLUE_DEV} -j ACCEPT > /dev/null 2>&1
 			iptables -A DHCPBLUEINPUT -p udp --source-port 68 --destination-port 67 -i ${BLUE_DEV} -j ACCEPT > /dev/null 2>&1
@@ -30,7 +30,15 @@ case "$1" in
 
 	stop)
 		boot_mesg "Stopping DHCP Server..."
-		killproc /usr/sbin/dhcpd
+		killproc -p /var/run/dhcpd.pid /usr/sbin/dhcpd
+		if [ "$(ps -A | grep " dhcpd")" != "" ] ; then
+		    # if fail use the hard way ...
+		    boot_mesg "Killing DHCP Server..."
+		    killall -w -s KILL /usr/sbin/dhcpd > /dev/null 2>&1
+		    rm -f /var/run/dhcpd.pid > /dev/null 2>&1
+		    echo_ok;
+		    exit 0
+		fi
 		;;
 
 	reload)