- enable timeouts even if not debugging

[packages/dhcp.git] / dhcp.init

diff --git a/dhcp.init b/dhcp.init
index ebf709e77fd8b66095ac136a1ae358d4e073809a..8a9229cf187a6bf18c76c36070ed8792cec712ec 100644 (file)
--- a/dhcp.init
+++ b/dhcp.init
@@ -15,17 +15,27 @@
 
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
-       if [ ! -f /var/lock/subsys/network ]; then
-               msg_network_down DHCPD
+       if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
+               msg_network_down "DHCP Server"
                exit 1
        fi
 else
        exit 0
 fi
 
-# See how we were called.
-case "$1" in
-  start)
+checkconfig() {
+       show "Checking %s configuration" "DHCP Server"
+       out=`/usr/sbin/dhcpd -t 2>&1`; rc=$?
+       if [ $rc -gt 0 ]; then
+               fail
+               echo >&2 "$out"
+       else
+               ok
+       fi
+       return $rc
+}
+
+start() {
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/dhcpd ]; then
                msg_starting "DHCP Server"
@@ -33,26 +43,45 @@ case "$1" in
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/dhcpd
        else
-               msg_already_running DHCPD
-               exit 1
+               msg_already_running "DHCP Server"
        fi
+}
+
+stop() {
+       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 "DHCP Server"
+       fi
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+       checkconfig || exit 1
+       start
        ;;
   stop)
-       msg_stopping "DHCP Server"
-       killproc dhcpd
-       rm -f /var/run/dhcpd.pid
-       rm -f /var/lock/subsys/dhcpd
+       stop
+       ;;
+  restart)
+       checkconfig || exit 1
+       stop
+       start
        ;;
-  restart|reload)
-       $0 stop
-       $0 start
+  checkconfig)
+       checkconfig
        ;;
   status)
        status dhcpd
+       exit $?
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|reload|status}"
-       exit 1
+       msg_usage "$0 {start|stop|restart|checkconfig|status}"
+       exit 3
 esac
 
 exit $RETVAL