[Pkg-nagios-changes] [SCM] debian packaging of icinga(-core) branch, master, updated. debian/1.6.1-2-10-g3fc1a26

[Alexander Wirt]

The following commit has been merged in the master branch:
commit 3fc1a267ac0c666cae08c622df648d3f5d975300
Author: Alexander Wirt <formorer at debian.org>
Date:   Sat Apr 7 12:45:53 2012 +0200

    Fix endlessloop in idoutils during installation
    
    Closes: #652647

diff --git a/debian/icinga-idoutils.postinst b/debian/icinga-idoutils.postinst
index 47b20c6..899895b 100644
--- a/debian/icinga-idoutils.postinst
+++ b/debian/icinga-idoutils.postinst
@@ -10,5 +10,10 @@ dbc_generate_include_owner='nagios:nagios'
 dbc_generate_include_args='--ucf -o template_infile=/usr/share/icinga/tmpl/ido2db.cfg-sample'
 dbc_go icinga-idoutils $@
 
+if [ -x "/etc/init.d/ido2db" ]; then
+	update-rc.d ido2db defaults 35 20 >/dev/null
+	invoke-rc.d ido2db start 3>&- || exit $?
+fi
+
 #DEBHELPER#
 
diff --git a/debian/icinga-idoutils.postrm b/debian/icinga-idoutils.postrm
index f406e67..d963c76 100644
--- a/debian/icinga-idoutils.postrm
+++ b/debian/icinga-idoutils.postrm
@@ -12,10 +12,14 @@ if [ -f /usr/share/dbconfig-common/dpkg/postrm ]; then
 fi
 
 if [ "$1" = "purge" ]; then
-	rm -f /etc/icinga/ido2db.cfg 
+	rm -f /etc/icinga/ido2db.cfg
 	ucf --purge /etc/icinga/ido2db.cfg
 	db_purge
 fi
 
+if [ "$1" = "purge" ] ; then
+	update-rc.d ido2db remove >/dev/null
+fi
+
 #DEBHELPER#
 
diff --git a/debian/icinga-idoutils.prerm b/debian/icinga-idoutils.prerm
index 0c3e76e..739cf8b 100644
--- a/debian/icinga-idoutils.prerm
+++ b/debian/icinga-idoutils.prerm
@@ -7,5 +7,8 @@ set -e
 . /usr/share/dbconfig-common/dpkg/prerm
 dbc_go icinga-idoutils $@
 
-#DEBHELPER#
+if [ -x "/etc/init.d/ido2db" ]; then
+	invoke-rc.d ido2db stop 3>&- || exit $?
+fi
 
+#DEBHELPER#
diff --git a/debian/rules b/debian/rules
index 9bf1509..8377a8e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -164,7 +164,7 @@ install-stamp: build-stamp fix-configs-stamp
 	dh_installlogrotate
 	dh_installchangelogs -i
 	dh_installinit 	     --name icinga -- defaults 30 18
-	dh_installinit	     -picinga-idoutils --name ido2db -- defaults 35 20
+	dh_installinit	  -n -picinga-idoutils --name ido2db -- defaults 35 20
 	chmod 755 ${b}/icinga-common/var/lib/icinga 
 	# the real version is in -cgi 
 	rm ${b}/icinga-common/etc/icinga/cgi.cfg

-- 
debian packaging of icinga(-core)