- rewrited with new functions

Changed files:
    named.init -> 1.9

diff --git a/named.init b/named.init
index bbef97eec40f3c14bd0381b61854edd29eff8b30..0bd639d46c284f85175af156716a8904ed2fd771 100644 (file)
--- a/named.init
+++ b/named.init
@@ -19,48 +19,64 @@ if [ -f /etc/sysconfig/named ]; then
 fi     
        
 # Check that networking is up.
-if [ "${NETWORKING}" = "no" ]; then
-       echo "WARNING: Networking is down. Named service can't be runed."
+if is_no "${NETWORKING}"; then
+        # nls "ERROR: Networking is down. %s can't be run." <service>
+        msg_Network_Down "Named"
        exit 1
 fi
-
+                       
 # Sanity check
 [ -f /etc/named.conf ] || exit 0
 
-
 # See how we were called.
 case "$1" in
   start)
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/named ]; then
-               show "Starting named daemon"
+               msg_starting "Named"
                touch /var/log/named && chown named.named /var/log/named
                daemon named -u named -g named && chown named.named \
                                                /var/run/named.pid
+               RETVAL=$?
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/named
        else
-               echo "Named already is running"
+               msg_Already_Running "Named"
+               exit 1
        fi
-        touch /var/lock/subsys/named
+
         ;;
   stop)
-        show Stopping named
-        killproc named
-        rm -f /var/lock/subsys/named
+        if [ -f /var/lock/subsys/named ]; then
+               msg_stopping "Named"
+               killproc named
+               rm -f /var/lock/subsys/named >/dev/null 2>&1
+        else
+               msg_Not_Running "Named"
+                exit 1
+        fi
+                                                                                                                       
         ;;
   status)
        /usr/sbin/ndc status
+       exit $?
        ;;
   reload)
-       show Reload named daemon
-        killproc named -HUP
+        if [ -f /var/lock/subsys/named ]; then
+               msg_reload "Named"
+               killproc named -HUP
+       else
+               msg_Not_Running "Named"
+               exit 1
+       fi
+                                                                                                                                                                                       
        ;;
   restart)
        $0 stop
        $0 start
        ;;
   *)
-        echo "Usage: $0 {start|stop|status|reload|restart}"
+        msg_Usage "$0 {start|stop|status|reload|restart}"
         exit 1
 esac
 
-exit 0
+exit $RETVAL