summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-analyzer/nagios-core/ChangeLog6
-rw-r--r--net-analyzer/nagios-core/files/nagios6
2 files changed, 8 insertions, 4 deletions
diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index 79a036364573..45605957bb9b 100644
--- a/net-analyzer/nagios-core/ChangeLog
+++ b/net-analyzer/nagios-core/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-analyzer/nagios-core
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.45 2004/11/22 19:53:06 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.46 2004/11/28 18:21:02 eldad Exp $
+
+ 28 Nov 2004; Eldad Zack <eldad@gentoo.org> files/nagios:
+ Removed -o option from start-stop-daemon, as it was causing errors to start or
+ stop slip by unnoticed.
22 Nov 2004; Eldad Zack <eldad@gentoo.org> nagios-core-1.2-r3.ebuild:
Fixed nagios.cmd permission problem, as suggested by Shawn Kovalchick
diff --git a/net-analyzer/nagios-core/files/nagios b/net-analyzer/nagios-core/files/nagios
index 20930037cab3..41bf62d5b481 100644
--- a/net-analyzer/nagios-core/files/nagios
+++ b/net-analyzer/nagios-core/files/nagios
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/files/nagios,v 1.6 2004/10/20 16:37:55 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/files/nagios,v 1.7 2004/11/28 18:21:02 eldad Exp $
opts="${opts} reload checkconfig"
@@ -33,14 +33,14 @@ start() {
touch /var/nagios/nagios.log /var/nagios/status.sav
chown nagios:nagios /var/nagios/nagios.log /var/nagios/status.sav
rm -f /var/nagios/rw/nagios.cmd
- start-stop-daemon -o --quiet --start --startas /usr/nagios/bin/nagios \
+ start-stop-daemon --quiet --start --startas /usr/nagios/bin/nagios \
--pidfile /var/nagios/nagios.lock -- -d /etc/nagios/nagios.cfg
eend $?
}
stop() {
ebegin "Stopping nagios"
- start-stop-daemon -o --quiet --stop --pidfile /var/nagios/nagios.lock
+ start-stop-daemon --quiet --stop --pidfile /var/nagios/nagios.lock
rm -f /var/nagios/status.log /var/nagios/nagios.tmp /var/nagios/nagios.lock /var/nagios/rw/nagios.cmd
eend $?
}