- unify, add try-restart

Changed files:
    named.init -> 1.42

diff --git a/named.init b/named.init
index d94131ebd679b2bd6517f1d01b65f673de555b45..541b28680ef4e932e4416108ff2c3c807e3a3f10 100644 (file)
--- a/named.init
+++ b/named.init
@@ -38,29 +38,58 @@ fi
 
 start() {
        # Check if the service is already running?
-       if [ ! -f /var/lock/subsys/named ]; then
-               msg_starting "Named"
-               modprobe -s capability > /dev/null 2>&1
-               [ -f /etc/localtime ] && cp -puL /etc/localtime $CHROOT_TO_DIR/etc/localtime
-               touch $CHROOT_TO_DIR/named.log && \
-                       chown named:named $CHROOT_TO_DIR/named.log
-               daemon --pidfile $CHROOT_TO_DIR/named.pid /usr/sbin/named -u named \
-                       -t $CHROOT_TO_DIR -c /etc/named.conf $NAMED_OPT </dev/null
-               RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/named
-       else
+       if [ -f /var/lock/subsys/named ]; then
                msg_already_running "Named"
+               return
        fi
+
+       msg_starting "Named"
+       modprobe -s capability > /dev/null 2>&1
+       [ -f /etc/localtime ] && cp -puL /etc/localtime $CHROOT_TO_DIR/etc/localtime
+       touch $CHROOT_TO_DIR/named.log && \
+               chown named:named $CHROOT_TO_DIR/named.log
+       daemon --pidfile $CHROOT_TO_DIR/named.pid /usr/sbin/named -u named \
+               -t $CHROOT_TO_DIR -c /etc/named.conf $NAMED_OPT </dev/null
+       RETVAL=$?
+       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/named
 }
 
 stop() {
-       if [ -f /var/lock/subsys/named ]; then
-               msg_stopping "Named"
-               killproc --pidfile $CHROOT_TO_DIR/named.pid named
-               rm -f /var/lock/subsys/named >/dev/null 2>&1
+       if [ ! -f /var/lock/subsys/named ]; then
+               msg_not_running "Named"
+               return
+       fi
+
+       msg_stopping "Named"
+       killproc --pidfile $CHROOT_TO_DIR/named.pid named
+       rm -f /var/lock/subsys/named >/dev/null 2>&1
+}
+
+reload() {
+       if [ ! -f /var/lock/subsys/named ]; then
+               msg_not_running "Named"
+               RETVAL=7
+               return
+       fi
+
+       if [ -f /etc/rndc.conf ]; then
+               run_cmd "$(nls 'Reloading %s service' 'Named')" /usr/sbin/rndc reload
        else
+               msg_reloading "Named"
+               killproc named -HUP
+               RETVAL=$?
+       fi
+}
+
+condrestart() {
+       if [ ! -f /var/lock/subsys/named ]; then
                msg_not_running "Named"
+               RETVAL=$1
+               return
        fi
+
+       stop
+       start
 }
 
 RETVAL=0
@@ -72,6 +101,16 @@ case "$1" in
   stop)
        stop
        ;;
+  restart)
+       stop
+       start
+       ;;
+  try-restart)
+       condrestart 0
+       ;;
+  reload|force-reload)
+       reload
+       ;;
   status)
        status named
        RETVAL=$?
@@ -83,27 +122,8 @@ case "$1" in
                fi
        fi
        ;;
-  reload|force-reload)
-       if [ -f /var/lock/subsys/named ]; then
-               if [ -f /etc/rndc.conf ]; then
-                       run_cmd "$(nls 'Reloading %s service' 'Named')" /usr/sbin/rndc reload
-               else
-                       msg_reloading "Named"
-                       killproc named -HUP
-                       RETVAL=$?
-               fi
-       else
-               msg_not_running "Named"
-               exit 7
-       fi
-
-       ;;
-  restart)
-       stop
-       start
-       ;;
   *)
-       msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
+       msg_usage "$0 {start|stop|restart|try-restart|reload|force-reload|status}"
        exit 3
 esac