- prevent dhcpd putting 8-byte dhcp-lease-time option in packets, from FC

[packages/dhcp.git] / dhcp.init

diff --git a/dhcp.init b/dhcp.init
index ebf709e77fd8b66095ac136a1ae358d4e073809a..c06ae4b348a7aa02a26541577ee10c9b7f82f232 100644 (file)
--- a/dhcp.init
+++ b/dhcp.init
@@ -15,7 +15,7 @@
 
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
-       if [ ! -f /var/lock/subsys/network ]; then
+       if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
                msg_network_down DHCPD
                exit 1
        fi
@@ -23,6 +23,7 @@ else
        exit 0
 fi
 
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
@@ -34,25 +35,29 @@ case "$1" in
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/dhcpd
        else
                msg_already_running DHCPD
-               exit 1
        fi
        ;;
   stop)
-       msg_stopping "DHCP Server"
-       killproc dhcpd
-       rm -f /var/run/dhcpd.pid
-       rm -f /var/lock/subsys/dhcpd
+       if [ -f /var/lock/subsys/dhcpd ]; then
+               msg_stopping "DHCP Server"
+               killproc dhcpd
+               rm -f /var/run/dhcpd.pid /var/lock/subsys/dhcpd >/dev/null 2>&1
+       else
+               msg_not_running DHCPD
+       fi
        ;;
   restart|reload)
        $0 stop
        $0 start
+       exit $?
        ;;
   status)
        status dhcpd
+       exit $?
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|reload|status}"
-       exit 1
+       msg_usage "$0 {start|stop|restart|force-reload|status}"
+       exit 3
 esac
 
 exit $RETVAL