summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjvdias <jvdias@fedoraproject.org>2005-05-18 02:26:57 +0000
committerjvdias <jvdias@fedoraproject.org>2005-05-18 02:26:57 +0000
commit6e144cb21b41ec65797dc05bf7002a5347cb0d1c (patch)
tree4ddd8ec0797893d8d1d81dc13ceca6ba5bbcba7b
parentb7b41adc3141c553b28e3f7b2c00d02867c39b88 (diff)
downloadbind-6e144cb21b41ec65797dc05bf7002a5347cb0d1c.tar.gz
bind-6e144cb21b41ec65797dc05bf7002a5347cb0d1c.tar.xz
bind-6e144cb21b41ec65797dc05bf7002a5347cb0d1c.zip
fix bugs: 157601, 156797, 154335
-rwxr-xr-xnamed.init10
1 files changed, 6 insertions, 4 deletions
diff --git a/named.init b/named.init
index 768a005..aaeb39e 100755
--- a/named.init
+++ b/named.init
@@ -28,11 +28,13 @@ prog="named"
start() {
# Start daemons.
+ echo -n $"Starting $prog: "
if [ -n "`/sbin/pidof named`" ]; then
echo -n $"$prog: already running"
+ failure
+ echo
return 1
fi
- echo -n $"Starting $prog: "
ckcf_options='-z'; # enable named-checkzone for each zone (9.3.1+) !
if [ -n "${ROOTDIR}" -a "x${ROOTDIR}" != "x/" ]; then
OPTIONS="${OPTIONS} -t ${ROOTDIR}"
@@ -111,13 +113,13 @@ start() {
stop() {
# Stop daemons.
echo -n $"Stopping $prog: "
- /usr/sbin/rndc stop || killproc named -TERM >/dev/null 2>&1
+ /usr/sbin/rndc stop >/dev/null 2>&1 || pidof named >/dev/null && killproc named -TERM >/dev/null 2>&1
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
rm -f /var/lock/subsys/named
rm -f /var/run/named.pid
- else
- /usr/sbin/rndc stop || killproc named -TERM >/dev/null 2>&1
+ elif pidof named >/dev/null; then
+ /usr/sbin/rndc stop >/dev/null 2>&1 || pidof named >/dev/null && killproc named -TERM >/dev/null 2>&1
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
rm -f /var/lock/subsys/named