- 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 b3f7afebd3b61c902cf490b09b31d56361f760d2..c06ae4b348a7aa02a26541577ee10c9b7f82f232 100644 (file)
--- a/dhcp.init
+++ b/dhcp.init
@@ -11,44 +11,53 @@
 . /etc/sysconfig/network
 
 # Get service config
-[ -f /etc/sysconfig/dhcp ] && . /etc/sysconfig/dhcp
+[ -f /etc/sysconfig/dhcpd ] && . /etc/sysconfig/dhcpd
 
 # Check that networking is up.
-[ "${NETWORKING}" = "no" ] && echo "Error: Networking is down" && exit 0
-
+if is_yes "${NETWORKING}"; then
+       if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
+               msg_network_down DHCPD
+               exit 1
+       fi
+else
+       exit 0
+fi
 
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/dhcpd ]; then
-               show Starting dhcpd
-               daemon dhcpd
+               msg_starting "DHCP Server"
+               daemon dhcpd $DHCPD_INTERFACES
+               RETVAL=$?
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/dhcpd
        else
-               echo "dhcpd already is running"
+               msg_already_running DHCPD
        fi
-       touch /var/lock/subsys/dhcpd
-       show Starting DHCP Server
-       daemon dhcpd
-       touch /var/lock/subsys/dhcpd
        ;;
   stop)
-       show 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 $?
        ;;
   *)
-       echo "Usage: $0 {start|stop|restart|reload|status}"
-       exit 1
+       msg_usage "$0 {start|stop|restart|force-reload|status}"
+       exit 3
 esac
 
-exit 0
-
+exit $RETVAL