diff options
Diffstat (limited to 'named.init')
| -rwxr-xr-x | named.init | 39 |
1 files changed, 15 insertions, 24 deletions
@@ -36,12 +36,6 @@ if [ -n "$ROOTDIR" ]; then fi; fi -# Run SDB backend? -named='named' -if `echo "$ENABLE_SDB" | grep -q ^[yY1].*`; then - named='named_sdb'; -fi; - # Manage forwarders through D-BUS? for a in $OPTIONS; do if [ $a = "-D" ]; then @@ -68,7 +62,7 @@ start() [ "${NETWORKING}" = "no" ] && exit 1 - [ -x /usr/sbin/$named ] || exit 5 + [ -x /usr/sbin/named ] || exit 5 # Handle -c option previous_option='unspecified'; @@ -87,9 +81,9 @@ start() fi; # all pre-start is done, lets start named - echo -n $"Starting $named: " - if [ -n "`/sbin/pidof -o %PPID $named`" ]; then - echo -n $"$named: already running" + echo -n $"Starting named: " + if [ -n "`/sbin/pidof -o %PPID named`" ]; then + echo -n $"named: already running" failure echo exit 1; @@ -117,21 +111,19 @@ start() # check if configuration is correct if [ -x /usr/sbin/named-checkconf ] && [ -x /usr/sbin/named-checkzone ] && /usr/sbin/named-checkconf $ckcf_options ${named_conf} >/dev/null 2>&1; then - daemon /usr/sbin/$named -u named ${OPTIONS}; + daemon /usr/sbin/named -u named ${OPTIONS}; RETVAL=$? if [ $RETVAL -eq 0 ]; then rm -f /var/run/named.pid; rm -f /var/run/named_sdb.pid; ln -s $ROOTDIR/var/run/named/named.pid /var/run/named.pid; - [ "$named" = "named_sdb" ] && ln -s $ROOTDIR/var/run/named/named.pid /var/run/named_sdb.pid; fi; - if [ -n "`/sbin/pidof -o %PPID $named`" ]; then + if [ -n "`/sbin/pidof -o %PPID named`" ]; then # Verify that named actually started (JM 2006-10-04) if [ ! -e $ROOTDIR/var/run/named/named.pid ]; then # If there is not a file containing the PID of the now running named daemon then create it (JM 2006-10-04) - echo `/sbin/pidof -o %PPID $named` > $ROOTDIR/var/run/named/named.pid; - [ "$named" = "named_sdb" ] && echo `/sbin/pidof -o %PPID $named` > $ROOTDIR/var/run/named/named_sdb.pid; + echo `/sbin/pidof -o %PPID named` > $ROOTDIR/var/run/named/named.pid; fi; fi; else @@ -155,16 +147,16 @@ start() stop() { # Stop daemons. - echo -n $"Stopping $named: " + echo -n $"Stopping named: " [ -x /usr/sbin/rndc ] && /usr/sbin/rndc stop >/dev/null 2>&1; RETVAL=$? # is it still here? - if /sbin/pidof -o %PPID $named >/dev/null; then + if /sbin/pidof -o %PPID named >/dev/null; then timeout=0 while : ; do - if /sbin/pidof -o %PPID $named >/dev/null; then + if /sbin/pidof -o %PPID named >/dev/null; then if [ $timeout -ge $NAMED_SHUTDOWN_TIMEOUT ]; then - killproc $named -TERM >/dev/null 2>&1 + killproc named -TERM >/dev/null 2>&1 RETVAL=$? echo $"no response, killing with -TERM " break @@ -182,7 +174,6 @@ stop() { if [ $RETVAL -eq 0 ]; then rm -f /var/lock/subsys/named rm -f /var/run/named.pid - rm -f /var/run/named_sdb.pid fi; # unmount mounted filesystems/directories @@ -209,7 +200,7 @@ stop() { rhstatus() { [ -x /usr/sbin/rndc ] && /usr/sbin/rndc status; - status /usr/bin/$named; + status /usr/bin/named; return $? } restart() { @@ -217,14 +208,14 @@ restart() { start } reload() { - echo -n $"Reloading $named: " - p=`/sbin/pidof -o %PPID $named` + echo -n $"Reloading named: " + p=`/sbin/pidof -o %PPID named` RETVAL=$? if [ "$RETVAL" -eq 0 ]; then /usr/sbin/rndc reload >/dev/null 2>&1 || /bin/kill -HUP $p; RETVAL=$? fi - [ "$RETVAL" -eq 0 ] && success $"$named reload" || failure $"$named reload" + [ "$RETVAL" -eq 0 ] && success $"named reload" || failure $"named reload" echo return $RETVAL } |