From: thepeople <thepeople@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 23 Mar 2010 01:43:31 +0000 (+0000)
Subject: This patch fixes wrong error checking in stop() and adds checking for already running... 
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=53cb4445452a4292328788820163ba5f2fa6d75e;p=packages.git

This patch fixes wrong error checking in stop() and adds checking for already running named, from #6903

git-svn-id: svn://svn.openwrt.org/openwrt/packages@20379 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/net/bind/files/named.init b/net/bind/files/named.init
index a82fed906..3c4c76adf 100644
--- a/net/bind/files/named.init
+++ b/net/bind/files/named.init
@@ -2,9 +2,14 @@
 START=50
 
 config_file=/etc/bind/named.conf
-pid_file=/var/run/named/named.pid
+pid_file=/var/run/named.pid
 
 start() {
+  if [ -e $pid_file ]
+  then
+     echo "  named already running with PID `cat $pid_file`"
+     return 1
+  fi
   echo Starting isc-bind
 
   /usr/sbin/named -c $config_file
@@ -21,13 +26,13 @@ stop() {
   then
     kill `cat $pid_file`
 
-    if [ $? -eq 0 ]
+    if [ $? -ne 0 ]
     then
       echo "  PID " `cat $pid_file` not found
       echo "  Is the named server running?"
     fi
 
-    rm $pid_file
+    rm -f $pid_file
 
     else
     echo "  $pid_file not found"