[gentoo-commits] gentoo-x86 commit in net-analyzer/ndoutils/files: ndo2db.init-nagios3 ndo2db.init

[Tobias Scherbaum (dertobi123)]

dertobi123    10/10/30 14:15:50

  Modified:             ndo2db.init-nagios3
  Removed:              ndo2db.init
  Log:
  Fix init script (#313739)
  
  (Portage version: 2.2.0_alpha2/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  net-analyzer/ndoutils/files/ndo2db.init-nagios3

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ndoutils/files/ndo2db.init-nagios3?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ndoutils/files/ndo2db.init-nagios3?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ndoutils/files/ndo2db.init-nagios3?r1=1.2&r2=1.3

Index: ndo2db.init-nagios3
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/ndoutils/files/ndo2db.init-nagios3,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ndo2db.init-nagios3	19 Jul 2008 15:08:25 -0000	1.2
+++ ndo2db.init-nagios3	30 Oct 2010 14:15:50 -0000	1.3
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ndoutils/files/ndo2db.init-nagios3,v 1.2 2008/07/19 15:08:25 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ndoutils/files/ndo2db.init-nagios3,v 1.3 2010/10/30 14:15:50 dertobi123 Exp $
 
 depends() {
 	before nagios
@@ -10,13 +10,16 @@
 
 start() {
 	ebegin "Starting ndo2db"
-	start-stop-daemon --start --quiet --exec /usr/bin/ndo2db-3x \
+	if [ -S /var/nagios/ndo.sock ] ; then
+		rm -f /var/nagios/ndo.sock
+	fi
+	start-stop-daemon --start --quiet --exec /usr/bin/ndo2db \
 	-- -c /etc/nagios/ndo2db.cfg
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping ndo2db"
-	start-stop-daemon --stop --quiet --exec /usr/bin/ndo2db-3x
+	start-stop-daemon --stop --quiet --exec /usr/bin/ndo2db
 	eend $?
 }