diff options
| author |   Tobias Scherbaum <dertobi123@gentoo.org> | 2010-10-30 14:15:50 +0000 |
|---|---|---|
| committer | Tobias Scherbaum <dertobi123@gentoo.org> | 2010-10-30 14:15:50 +0000 |
| commit | 1bad6da3e40d1606461f25245715b1c745ac1eb3 (patch) | |
| tree | 83d3fa11a638142e86e66d430d34f67d2fb4dffb /net-analyzer | |
| parent | Added specific version to the xdebug dep (diff) | |
| download | gentoo-2-1bad6da3e40d1606461f25245715b1c745ac1eb3.tar.gz gentoo-2-1bad6da3e40d1606461f25245715b1c745ac1eb3.tar.bz2 gentoo-2-1bad6da3e40d1606461f25245715b1c745ac1eb3.zip | |
Fix init script (#313739)
(Portage version: 2.2.0_alpha2/cvs/Linux x86_64)
Diffstat (limited to 'net-analyzer')
| -rw-r--r-- | net-analyzer/ndoutils/ChangeLog | 6 | ||||
| -rwxr-xr-x | net-analyzer/ndoutils/files/ndo2db.init | 22 | ||||
| -rwxr-xr-x | net-analyzer/ndoutils/files/ndo2db.init-nagios3 | 11 |
3 files changed, 12 insertions, 27 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/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 $? } |