[packages] znc: commit missing parts of r24548

[openwrt/svn-archive/archive.git] / net / dhcp / files / dhcpd.init

diff --git a/net/dhcp/files/dhcpd.init b/net/dhcp/files/dhcpd.init
index 15159bb8e3a8ee332fae91d5c0bada204af4c2d0..c9ac1e3084914c9a3428a09804bbc552965875f9 100644 (file)
--- 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
@@ -15,7 +20,7 @@ start() {
        
        /usr/sbin/dhcpd -q -cf $config_file -lf $lease_file
        
-       if [ $$ -eq 0 ]; then
+       if [ $? -ne 0 ]; then
                echo "  isc-dhcpd failed to start"
        fi
 }
@@ -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 [ $$ -eq 0 ]; then
+               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