[Pkg-nagios-changes] [pkg-nagios] r1105 - nagios2/trunk/debian

[Marc Haber]

Author: zugschlus
Date: 2007-01-27 13:41:58 +0100 (Sat, 27 Jan 2007)
New Revision: 1105

Modified:
   nagios2/trunk/debian/changelog
   nagios2/trunk/debian/nagios2-common.nagios2.init
Log:
  * init script: remove commented sleep-rekill loop which was confusing
    to some users. It has never been enabled in nagios2 and is probably
    left over from whatever package the original nagios2 init script
    was taken from. Closes: #408231



Modified: nagios2/trunk/debian/changelog
===================================================================
--- nagios2/trunk/debian/changelog	2007-01-27 12:38:33 UTC (rev 1104)
+++ nagios2/trunk/debian/changelog	2007-01-27 12:41:58 UTC (rev 1105)
@@ -8,8 +8,12 @@
     /usr/share/doc/nagios2-doc/html as suggested by Mike O'Connor.
     Closes: #408141
   * init script: use awk -v FS. Thanks to Mike O'Connor. Closes: #408136
+  * init script: remove commented sleep-rekill loop which was confusing
+    to some users. It has never been enabled in nagios2 and is probably
+    left over from whatever package the original nagios2 init script
+    was taken from. Closes: #408231
 
- -- Marc Haber <mh+debian-packages at zugschlus.de>  Sat, 27 Jan 2007 13:37:57 +0100
+ -- Marc Haber <mh+debian-packages at zugschlus.de>  Sat, 27 Jan 2007 13:40:13 +0100
 
 nagios2 (2.6-2) unstable; urgency=low
 

Modified: nagios2/trunk/debian/nagios2-common.nagios2.init
===================================================================
--- nagios2/trunk/debian/nagios2-common.nagios2.init	2007-01-27 12:38:33 UTC (rev 1104)
+++ nagios2/trunk/debian/nagios2-common.nagios2.init	2007-01-27 12:41:58 UTC (rev 1105)
@@ -151,22 +151,6 @@
     if [ -n "$PID" ]; then
       kill -15 -"$PID"
       ret=$?
-#      sleep 1
-#      if kill -0 "$PID" 2>/dev/null; then
-#        ret=$?
-#        log_progress_msg "Waiting . "
-#        cnt=0
-#        while kill -0 "$PID" 2>/dev/null; do
-#          ret=$?
-#          cnt=`expr "$cnt" + 1`
-#          if [ "$cnt" -gt 15 ]; then
-#            kill -9 -"$PID"
-#            break
-#          fi
-#          sleep 2
-#          log_progress_msg ". "
-#        done
-#      fi
     else
       killproc -p $THEPIDFILE
       ret=$?