[Pkg-nagios-devel] nagios changelog,1.22,1.23 nagios-common.nagios.init,1.2,1.3

Update of /cvsroot/pkg-nagios/nagios
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv16057

Modified Files:
	changelog nagios-common.nagios.init 
Log Message:
one more change to the init script.

unless anyone objects, i'll be uploading this to unstable sometime
tomorrow, after i've verified that there aren't any problems building,
installing, or upgrading it.


	sean



Index: changelog
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/changelog,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23

--- changelog	2 Dec 2004 17:07:10 -0000	1.22
+++ changelog	5 Dec 2004 05:45:19 -0000	1.23
@@ -17,6 +17,9 @@
     - init script has a better check for running nagios processes.  really,
       we should be use start-stop-daemon, but this will work for
       the time being.  thanks again, Olaf.  (Closes: #283875)
+    - removed the "-e 5" from the check_started part of the init script,
+      as it was preventing some users from restarting (see #283875).
+      thanks to tony mancill <tony@mancill.com>.
 
  -- Sean Finney <seanius@debian.org>  Thu, 02 Dec 2004 12:05:10 -0500
 

Index: nagios-common.nagios.init
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/nagios-common.nagios.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- nagios-common.nagios.init	2 Dec 2004 17:07:11 -0000	1.2
+++ nagios-common.nagios.init	5 Dec 2004 05:45:19 -0000	1.3
@@ -37,7 +37,7 @@
  	    return 1    # Isn't started
  	fi
     elif [ -f /usr/lib/nagios/plugins/check_nagios ]; then
-	if /usr/lib/nagios/plugins/check_nagios -F /var/log/nagios/status.log -e 5 -C 'nagios' > /dev/null; then
+	if /usr/lib/nagios/plugins/check_nagios -F /var/log/nagios/status.log -C 'nagios' > /dev/null; then
 	    return 0    # Is started
 	else
 	    return 1    # Isn't started



