- release 2 (grr .. ;).

[packages/maradns.git] / maradns.init

diff --git a/maradns.init b/maradns.init
index 10717f062528d3f90c277c282649a66be54eb731..006e5d21da45c094e47697b29b177dd93a243aba 100644 (file)
--- a/maradns.init
+++ b/maradns.init
@@ -16,7 +16,7 @@
 
 # Check that networking is up.
 if is_no "${NETWORKING}"; then
-        msg_Network_Down "maraDNS"
+        msg_network_down "maraDNS"
        exit 1
 fi
                        
@@ -29,13 +29,23 @@ case "$1" in
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/maradns ]; then
                msg_starting "maraDNS"
-               daemon maradns -f /etc/mararc &
-               sleep 1
-               ok
-               RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/maradns
+               maradns -f /etc/mararc > /var/log/maradns &
+      busy
+      # what if it won't start on time? wait a bit for it :)
+      sleep 1
+      pid=`pidofproc maradns`
+      if [ -n "$pid" ]; then
+         RETVAL=0
+         touch /var/lock/subsys/maradns
+         log_success "maradns startup"
+         ok
+      else
+         RETVAL=1
+         log_failed "maradns startup"
+         fail
+      fi
        else
-               msg_Already_Running "maraDNS"
+               msg_already_running "maraDNS"
                exit 1
        fi
         ;;
@@ -45,32 +55,19 @@ case "$1" in
                killproc maradns
                rm -f /var/lock/subsys/maradns >/dev/null 2>&1
         else
-               msg_Not_Running "maraDNS"
+               msg_not_running "maraDNS"
                 exit 1
         fi
        ;;
   status)
-# "status" Not implemented yet
-#      /usr/sbin/rndc status
-#      exit $?
        status maradns
-       ;;
-  reload)
-        if [ -f /var/lock/subsys/maradns ]; then
-               msg_reloading "maraDNS"
-               killproc maradns -HUP
-       else
-               msg_Not_Running "maraDNS"
-               exit 1
-       fi
-                                                                                                                                                                                       
        ;;
   restart)
        $0 stop
        $0 start
        ;;
   *)
-        msg_Usage "$0 {start|stop|status|reload|restart}"
+        msg_Usage "$0 {start|stop|status|restart}"
         exit 1
 esac