Fix init script (#313739)

Package-Manager: portage-2.2.0_alpha2/cvs/Linux x86_64

4 files changed, 14 insertions, 30 deletions

diff --git a/net-analyzer/ndoutils/ChangeLog b/net-analyzer/ndoutils/ChangeLog
index 995846386a2e..3b5851be41e3 100644
--- a/net-analyzer/ndoutils/ChangeLog
+++ b/net-analyzer/ndoutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/ndoutils
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ndoutils/ChangeLog,v 1.10 2010/06/03 18:41:51 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ndoutils/ChangeLog,v 1.11 2010/10/30 14:15:50 dertobi123 Exp $
+
+  30 Oct 2010; Tobias Scherbaum <dertobi123@gentoo.org> -files/ndo2db.init,
+  files/ndo2db.init-nagios3:
+  Fix init script (#313739)
 
 *ndoutils-1.4_beta9 (03 Jun 2010)
 
diff --git a/net-analyzer/ndoutils/Manifest b/net-analyzer/ndoutils/Manifest
index fc4934cff9ef..e4dafe379a24 100644
--- a/net-analyzer/ndoutils/Manifest
+++ b/net-analyzer/ndoutils/Manifest
@@ -1,6 +1,5 @@
-AUX ndo2db.init 547 RMD160 f463c156a0577585809d8a01470b042d535f4a98 SHA1 d04b6030285d415cb8b032a27816401bd2bc542b SHA256 46d482286bc19e3cb31a4a3caca1c98fa23282e442729e49d0739f8a254b563c
-AUX ndo2db.init-nagios3 541 RMD160 813603dcbb9d2189b7a22c5509d0560e5297ae8d SHA1 a1bb4e33907c36c8ee240b6527acd60864240fdf SHA256 3962a6cf6b9c5f60041247e2ee14ce8164d05a76affaf644198753f6330d622f
+AUX ndo2db.init-nagios3 607 RMD160 653f69cd72a3fa25042533ab7c66fedb93648234 SHA1 7d3976574cf34281645798712dd25a29df18b349 SHA256 e4729dece963cb72277868fb19299dc03d3b8a8d9708cfb7f23d80e65a2b135d
 DIST ndoutils-1.4b9.tar.gz 2135521 RMD160 9ff3a5d6c6b511eaf5a069dd0e3433e392d3187c SHA1 28877b5d721824c74682a9f971c90c9461df8925 SHA256 9d85187ec41586e91dc89630a9332d53aa78efa8f2bd9be8019bd7a2558b9306
 EBUILD ndoutils-1.4_beta9.ebuild 1402 RMD160 d82d10fedc0f27c9d273cec6b64a2d4d86c8a366 SHA1 7ffe53d2dc7a590b5e7af39b384e7f5028f2f805 SHA256 382da2ed3b6d09354e7016ac05f1c913c9b1547b5a2fb6c84de19f8816578633
-MISC ChangeLog 1896 RMD160 6ef6f495c1cc4e0469fb7b75af0fbabcfd3e1aa8 SHA1 920245ea642027d16b7ddcfbe4363467f2ea2859 SHA256 c9b9f11a51a95828af7287bdfcf5fada8b6fc06dcf7937b517dafd06bc4219f2
+MISC ChangeLog 2030 RMD160 3f1f4134910b37a5dfed41f6ec6751ebb8158360 SHA1 a98950b365dca622198c2214847edc77b0c89cb0 SHA256 a7e784fd8d32f559ba83c9f68bbd6ad89f639c1d28c6eddb3f9b8ef57eae6596
 MISC metadata.xml 260 RMD160 ac6f569eb1667b364a6d503a3f273505ff0ee274 SHA1 07ea89243966d135d235f7e464a480ab0e698d6b SHA256 eafa2ff6e208c288e02395e29355263b6c969ae23f19ec118835c14f2fcee05f
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 $?
 }