- updated to rc-scripts 0.2.0

Changed files:
    dhcp-relay.init -> 1.7
    dhcp.init -> 1.7

diff --git a/dhcp-relay.init b/dhcp-relay.init
index 7067331f21a84a68993cbbc2550dc8f0881b4452..62c327c63f520545399e2b5999381708815e1ed7 100644 (file)
--- a/dhcp-relay.init
+++ b/dhcp-relay.init
@@ -7,22 +7,27 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-if [ -f /etc/sysconfig/dhcrelay ]; then
-       . /etc/sysconfig/dhcrelay
-else
-       exit 0
-fi
+# Source networking configuration.
+. /etc/sysconfig/network
+
+# Demon specified configuration.
+. /etc/sysconfig/dhcp-relay
 
+# Check that networking is up.
+if is_no "${NETWORKING}"; then
+       msg_Network_Down "DHCP Realay"
+       exit 1
+fi
 
 # See how we were called.
 case "$1" in
   start)
-       show Starting DHCP Relay
+       msg_starting "DHCP Relay"
        daemon dhcrelay $DHCP_SERVERS
        touch /var/lock/subsys/dhcrelay
        ;;
   stop)
-       show Stopping DHCP Relay
+       msg_stopping "DHCP Relay"
        killproc dhcrelay
        rm -f /var/lock/subsys/dhcrelay
        ;;
@@ -34,7 +39,7 @@ case "$1" in
        status dhcrelay
        ;;
   *)
-       echo "Usage: $0 {start|stop|restart|status}"
+       msg_Usage "$0 {start|stop|restart|status}"
        exit 1
 esac
 

diff --git a/dhcp.init b/dhcp.init
index c98f7bc897729ce6605581ca6545e3d425a98a4f..be7878b48062c55084cb189274c32dd9da1abcf9 100644 (file)
--- a/dhcp.init
+++ b/dhcp.init
@@ -14,26 +14,26 @@
 [ -f /etc/sysconfig/dhcpd ] && . /etc/sysconfig/dhcpd
 
 # Check that networking is up.
-if [ "${NETWORKING}" = "no" ]; then
-       nls "WARNING: Networking is down. Dhcpd sercice can't be runed."
+if is_no "${NETWORKING}"; then
+       msg_Network_Down DHCPD
        exit 1
 fi
 
-
 # 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 DHCP Server
+               msg_starting "DHCP Server"
                daemon dhcpd $DHCPD_INTERFACES
        else
-               nls "dhcpd already is running\n"
+               msg_Already_Running DHCPD
+               exit 1
        fi
        touch /var/lock/subsys/dhcpd
        ;;
   stop)
-       show Stopping DHCP Server
+       msg_stopping "DHCP Server"
        killproc dhcpd
        rm -f /var/run/dhcpd.pid
        rm -f /var/lock/subsys/dhcpd
@@ -46,7 +46,7 @@ case "$1" in
        status dhcpd
        ;;
   *)
-       nls "Usage: $0 {start|stop|restart|reload|status}"
+       msg_Usage "$0 {start|stop|restart|reload|status}"
        exit 1
 esac