- LSB conformance

Changed files:
    named-chroot.init -> 1.4
    named.init -> 1.21

diff --git a/named-chroot.init b/named-chroot.init
index a76fe5e3a6d5f9ba206adb387635bf2bd152986e..6f69168fe7160e7bb74bee6db04f591efa5ef63b 100644 (file)
--- a/named-chroot.init
+++ b/named-chroot.init
@@ -29,6 +29,7 @@ fi
 # Sanity check
 [ -f /etc/named.conf ] || exit 0
 
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
@@ -50,7 +51,6 @@ case "$1" in
                fi
        else
                msg_already_running "Named"
-               exit 1
        fi
        ;;
   stop)
@@ -62,31 +62,31 @@ case "$1" in
                rm -f /var/lock/subsys/named >/dev/null 2>&1
        else
                msg_not_running "Named"
-               exit 1
        fi
        ;;
   status)
        /usr/sbin/ndc.chroot status
        exit $?
        ;;
-  reload)
+  reload|force-reload)
        if [ -f /var/lock/subsys/named ]; then
                msg_reloading "Named"
                killproc named -HUP
                RETVAL=$?
        else
-               msg_not_running "Named"
-               exit 1
+               msg_not_running "Named" >&2
+               exit 7
        fi
                                                                                                                                                                                        
        ;;
   restart)
        $0 stop
        $0 start
+       exit $?
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|reload|status}"
-       exit 1
+       msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
+       exit 3
 esac
 
 exit $RETVAL

diff --git a/named.init b/named.init
index 6fe6cad92439e9c095e2f6b489cd37edee535d88..8d66895c9b08994e8c6bd8159e0b7f8b09ff316f 100644 (file)
--- a/named.init
+++ b/named.init
@@ -30,6 +30,7 @@ fi
 # Sanity check
 [ -e /etc/named.conf ] || exit 0
 
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
@@ -44,7 +45,6 @@ case "$1" in
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/named
        else
                msg_already_running "Named"
-               exit 1
        fi
        ;;
   stop)
@@ -54,19 +54,19 @@ case "$1" in
                rm -f /var/lock/subsys/named >/dev/null 2>&1
        else
                msg_not_running "Named"
-               exit 1
        fi
        ;;
   status)
        status named
-       if [ -f /etc/rndc.conf ] ; then
+       RETVAL $?
+       if [ -f /etc/rndc.conf ]; then
                /usr/sbin/rndc status
-               RETVAL=$?
+#              RETVAL=$?
        fi
        ;;
-  reload)
+  reload|force-reload)
        if [ -f /var/lock/subsys/named ]; then
-               if [ -f /etc/rndc.conf ] ; then
+               if [ -f /etc/rndc.conf ]; then
                        run_cmd "$(nls 'Reloading %s service' 'Named')" /usr/sbin/rndc reload
                else
                        msg_reloading "Named"
@@ -74,18 +74,19 @@ case "$1" in
                        RETVAL=$?
                fi
        else
-               msg_not_running "Named"
-               exit 1
+               msg_not_running "Named" >&2
+               exit 7
        fi
                                                                                                                                                                                        
        ;;
   restart)
        $0 stop
        $0 start
+       exit $?
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|reload|status}"
-       exit 1
+       msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
+       exit 3
 esac
 
 exit $RETVAL