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

[Marc Haber]

tags 456958 pending
thanks

Author: zugschlus
Date: 2008-02-18 16:28:52 +0000 (Mon, 18 Feb 2008)
New Revision: 1356

Modified:
   nagios2/trunk/debian/changelog
   nagios2/trunk/debian/nagios2-common.nagios2.init
Log:
  * init script: Tell killproc which daemon to kill.
    Thanks to Mark Petersen. Closes: #456958



Modified: nagios2/trunk/debian/changelog
===================================================================
--- nagios2/trunk/debian/changelog	2008-02-18 16:18:04 UTC (rev 1355)
+++ nagios2/trunk/debian/changelog	2008-02-18 16:28:52 UTC (rev 1356)
@@ -3,11 +3,13 @@
   * NOT RELEASED YET
   * remove wrong NOT RELEASED YET entry from 2.10-1 changelog
   * Add debian/watch file. Thanks to Raphael Geissert. Closes: #456018
+  * init script: Tell killproc which daemon to kill.
+    Thanks to Mark Petersen. Closes: #456958
 
   [Jan Wagner]
   * added Vcs- fields
 
- -- Marc Haber <mh+debian-packages at zugschlus.de>  Mon, 18 Feb 2008 17:17:11 +0100
+ -- Marc Haber <mh+debian-packages at zugschlus.de>  Mon, 18 Feb 2008 17:28:06 +0100
 
 nagios2 (2.10-1) unstable; urgency=low
 

Modified: nagios2/trunk/debian/nagios2-common.nagios2.init
===================================================================
--- nagios2/trunk/debian/nagios2-common.nagios2.init	2008-02-18 16:18:04 UTC (rev 1355)
+++ nagios2/trunk/debian/nagios2-common.nagios2.init	2008-02-18 16:28:52 UTC (rev 1356)
@@ -144,7 +144,7 @@
 }
 
 stop () {
-    killproc -p $THEPIDFILE
+    killproc -p "$THEPIDFILE" "$DAEMON"
     ret=$?
     if ! check_named_pipe; then
       rm -f $nagiospipe
@@ -177,7 +177,7 @@
   # Check first
   if check_config; then
     if check_started; then
-      killproc -p $THEPIDFILE $DAEMON 1 
+      killproc -p "$THEPIDFILE" "$DAEMON" 1
     else
       log_failure_msg "Not running."
       log_end_msg 7