use abstraction barriers (init script) for restarting named

[moira.git] / gen / hesiod.sh

diff --git a/gen/hesiod.sh b/gen/hesiod.sh
index e36ac5717191dede252b3d6eefccaa84742609dc..df865d6ffd7d43ffa75b7a3a9cd601027b2ab6e4 100644 (file)
--- a/gen/hesiod.sh
+++ b/gen/hesiod.sh
@@ -29,7 +29,7 @@ SRC_DIR=/etc/athena/_nameserver
 # Directory into which we will put the final product
 DEST_DIR=/etc/athena/nameserver
 
-NAMED=/etc/athena/named
+INIT=/etc/init.d/athena-bind
 NAMED_PID=/var/athena/named.pid
 
 # Create the destination directory if it doesn't exist
@@ -44,9 +44,13 @@ fi
 # on the same parition as $DEST_DIR.
 if test ! -d $SRC_DIR
 then
-       chdir $DEST_DIR
+       # Tell linux cd/pwd not to be so "helpful".
+       # This will generate an ignorable error on older platforms.
+       set -P
+
+       cd $DEST_DIR
        mkdir ../_nameserver
-       chdir ../_nameserver
+       cd ../_nameserver
        if test $SRC_DIR != `pwd`
        then
                ln -s `pwd` $SRC_DIR
@@ -74,6 +78,7 @@ do
    # Make sure the file is not zero-length
    if test ! -z $file
    then
+      chmod o+r $file
       mv -f $file $DEST_DIR
       if test $? -ne 0
       then
@@ -90,15 +95,13 @@ done
 # existance as evidence that named as has been successfully restarted.
 
 # First, get statistics
-kill -ILL `cat $NAMED_PID`
+/usr/athena/etc/rndc stats
 sleep 1
-kill -KILL `cat $NAMED_PID`
+$INIT stop
 rm -f $NAMED_PID
 
 # Restart named.
-$NAMED
-echo named started
-
+$INIT start
 sleep 1
 # This timeout is implemented by having the shell check TIMEOUT times
 # for the existance of $NAMED_PID and to sleep INTERVAL seconds