- enable timeouts even if not debugging

[packages/dhcp.git] / dhcp-relay.init

diff --git a/dhcp-relay.init b/dhcp-relay.init
index c67138a8ba19ed8d435de5b9083e38ee207ae28e..a76b49d53b97a90fe6d6cf965e77a52eb526ef16 100644 (file)
--- a/dhcp-relay.init
+++ b/dhcp-relay.init
@@ -11,19 +11,26 @@
 . /etc/sysconfig/network
 
 # Demon specified configuration.
+OPTIONS=""
 . /etc/sysconfig/dhcp-relay
 
 # Check that networking is up.
-if is_no "${NETWORKING}"; then
-       msg_Network_Down "DHCP realay"
-       exit 1
+if is_yes "${NETWORKING}"; then
+       if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
+               msg_network_down "DHCP realay"
+               exit 1
+       fi
+else
+       exit 0
 fi
 
-if [ -n "DHCP_REALY_INTERFACES" ]; then
-       OPTIONS="-i $DHCP_REALY_INTERFACES"
+if [ -n "DHCP_RELAY_INTERFACES" ]; then
+       for iface in $DHCP_RELAY_INTERFACES ; do
+               OPTIONS="$OPTIONS -i $iface"
+       done
 fi
 
-
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
@@ -34,25 +41,30 @@ case "$1" in
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/dhcp-relay
        else
-               msg_Already_Running "DHCP relay"
-               exit 1
+               msg_already_running "DHCP relay"
        fi
        ;;
   stop)
-       msg_stopping "DHCP relay"
-       killproc dhcrelay
-       rm -f /var/lock/subsys/dhcp-relay
+       if [ -f /var/lock/subsys/dhcp-relay ]; then
+               msg_stopping "DHCP relay"
+               killproc dhcrelay
+               rm -f /var/lock/subsys/dhcp-relay
+       else
+               msg_not_running "DHCP relay"
+       fi
        ;;
-  restart|reload)
+  restart|force-reload)
        $0 stop
        $0 start
+       exit $?
        ;;
   status)
        status dhcrelay
+       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