This patch fixes wrong error checking in stop() and adds checking for already running...

[openwrt/svn-archive/archive.git] / net / bind / files / named.init

diff --git a/net/bind/files/named.init b/net/bind/files/named.init
old mode 100755 (executable)
new mode 100644 (file)
index 99b8e0b..3c4c76a
--- a/net/bind/files/named.init
+++ b/net/bind/files/named.init
@@ -5,11 +5,16 @@ config_file=/etc/bind/named.conf
 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
 
-  if [ $$ -eq 0 ]
+  if [ $? -ne 0 ]
   then
     echo "  isc-bind failed to start"
   fi
@@ -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"