[pkg-dhcp-commits] [SCM] ISC DHCP packaging for Debian branch, master, updated. upstream/4.1.1-59-ga4c6c68

[Andrew Pollock]

The following commit has been merged in the master branch:
commit ea61468938f2a57333d98b4744a7b6c6febd76be
Author: Andrew Pollock <apollock at debian.org>
Date:   Tue Jun 15 19:42:41 2010 -0700

    Stop using dh_installinit --noscripts
    
    Not entirely sure why this was being used (possibly purely to allow the startup
    of the DHCP server to fail in a non-bringing-down-the-house fashion, but I
    think we can deal with that in other ways
    
    This will allow for better handling of the init scripts by debhelper than what
    was previously being done by hand

diff --git a/debian/changelog b/debian/changelog
index 61506c6..c698d5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+isc-dhcp (4.1.1-P1-3) experimental; urgency=low
+
+  * debian/rules: stop invoking dh_installinit with --noscripts so the
+    update-rc.d stuff is done properly
+  * debian/isc-dhcp-{relay,server}.{postinst,postrm}: remove calls to
+    update-rc.d and invoke-rc.d, let dh_installinit handle it
+
+ -- Andrew Pollock <apollock at debian.org>  Tue, 15 Jun 2010 19:40:52 -0700
+
 isc-dhcp (4.1.1-P1-2) experimental; urgency=low
 
   * debian/isc-dhcp-{server,relay}.init: go back to not mentioning any
diff --git a/debian/isc-dhcp-relay.postinst b/debian/isc-dhcp-relay.postinst
index ad85e28..c75aa96 100644
--- a/debian/isc-dhcp-relay.postinst
+++ b/debian/isc-dhcp-relay.postinst
@@ -82,10 +82,6 @@ rm ${TMPFILE}
 
 # ------------------------- Debconf questions end ---------------------
 
-update-rc.d isc-dhcp-relay defaults > /dev/null
-
-invoke-rc.d isc-dhcp-relay start
-
 db_stop
 
 #DEBHELPER#
diff --git a/debian/isc-dhcp-relay.postrm b/debian/isc-dhcp-relay.postrm
index 2ab403d..26b2736 100644
--- a/debian/isc-dhcp-relay.postrm
+++ b/debian/isc-dhcp-relay.postrm
@@ -5,8 +5,6 @@
 if [ "$1" = "purge" ]; then
     # Remove init.d configuration file
     rm -f /etc/default/isc-dhcp-relay
-
-    update-rc.d isc-dhcp-relay remove >/dev/null
 fi
 
 #DEBHELPER#
diff --git a/debian/isc-dhcp-server.postinst b/debian/isc-dhcp-server.postinst
index 14ad73c..1cd4456 100644
--- a/debian/isc-dhcp-server.postinst
+++ b/debian/isc-dhcp-server.postinst
@@ -6,8 +6,6 @@
 
 set -e
 
-#DEBHELPER#
-
 case "$1" in
 	configure)
 		# continue below
@@ -62,6 +60,7 @@ cp ${TMPFILE} ${INITCONFFILE}
 rm ${TMPFILE}
 
 # ------------------------- Debconf questions end ---------------------
+db_stop
 
 if [ ! -e /var/lib/dhcp/dhcpd.leases ]; then
     if test -e /var/lib/dhcp3/dhcpd.leases; then
@@ -84,11 +83,6 @@ fi
 
 [ -x /sbin/restorecon ] && restorecon /var/lib/dhcp/dhcpd.leases
 
-update-rc.d isc-dhcp-server start 40 2 3 4 5 . >/dev/null
-
-# Init script could fail, since dhcp is unconfigured on a new install
-invoke-rc.d isc-dhcp-server start || true
-
-db_stop
+#DEBHELPER#
 
 exit 0
diff --git a/debian/isc-dhcp-server.postrm b/debian/isc-dhcp-server.postrm
index 33ca293..07604a1 100644
--- a/debian/isc-dhcp-server.postrm
+++ b/debian/isc-dhcp-server.postrm
@@ -18,8 +18,6 @@ case "$1" in
 
 	# Remove init.d configuration file
 	rm -f /etc/default/isc-dhcp-server
-
-	update-rc.d isc-dhcp-server remove >/dev/null
 	;;
 
     upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
diff --git a/debian/rules b/debian/rules
index d7ba52b..e276c8d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -146,7 +146,7 @@ binary-arch: build install
 	dh_installdocs -A debian/README.Debian -X doc/ja_JP.eucJP
 	dh_installdocs -pisc-dhcp-server-ldap contrib/dhcpd-conf-to-ldap.pl	
 	dh_installexamples -a
-	dh_installinit -a -n
+	dh_installinit -a
 	dh_installchangelogs
 	dh_installchangelogs -pisc-dhcp-server-ldap Changelog-LDAP 
 	dh_install -pisc-dhcp-server-ldap	

-- 
ISC DHCP packaging for Debian