Fix init script (#313739)

(Portage version: 2.2.0_alpha2/cvs/Linux x86_64)

2 files changed, 7 insertions, 26 deletions

diff --git a/net-analyzer/ndoutils/files/ndo2db.init b/net-analyzer/ndoutils/files/ndo2db.init
deleted file mode 100755
index d2864be7efc0..000000000000
--- a/net-analyzer/ndoutils/files/ndo2db.init
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ndoutils/files/ndo2db.init,v 1.1 2007/07/01 08:29:56 dertobi123 Exp $
-
-depends() {
-	before nagios
-	need mysql
-}
-
-start() {
-	ebegin "Starting ndo2db"
-	start-stop-daemon --start --quiet --exec /usr/nagios/bin/ndo2db-2x \
-	-- -c /etc/nagios/ndo2db.cfg
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ndo2db"
-	start-stop-daemon --stop --quiet --exec /usr/nagios/bin/ndo2db-2x
-	eend $?
-}
diff --git a/net-analyzer/ndoutils/files/ndo2db.init-nagios3 b/net-analyzer/ndoutils/files/ndo2db.init-nagios3
index 88d9bf94cb4f..ad5ae3691d9a 100755
--- a/net-analyzer/ndoutils/files/ndo2db.init-nagios3
+++ b/net-analyzer/ndoutils/files/ndo2db.init-nagios3
@@ -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 @@ depends() {
 
 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 $?
 }