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

[Andrew Pollock]

The following commit has been merged in the master branch:
commit 1c95e7c9b1e53e3eb058b7dced30e7349f5b3eb0
Author: Andrew Pollock <apollock at debian.org>
Date:   Tue Jun 15 23:48:03 2010 -0700

    Ignore failure to start the DHCP server

diff --git a/debian/changelog b/debian/changelog
index 1e1f050..c25d01b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ isc-dhcp (4.1.1-P1-3) experimental; urgency=low
     update-rc.d and invoke-rc.d, let dh_installinit handle it
   * debian/isc-dhcp-server.init.d: add a start-time dependency on $named
     (closes: #586035)
+  * debian/{rules,isc-dhcp-server.{prerm,postinst}}: ignore failure to start
+    the DHCP server
 
- -- Andrew Pollock <apollock at debian.org>  Tue, 15 Jun 2010 20:14:33 -0700
+ -- Andrew Pollock <apollock at debian.org>  Tue, 15 Jun 2010 23:20:30 -0700
 
 isc-dhcp (4.1.1-P1-2) experimental; urgency=low
 
diff --git a/debian/isc-dhcp-relay.init.d b/debian/isc-dhcp-relay.init.d
index 4fd6622..6526ba0 100644
--- a/debian/isc-dhcp-relay.init.d
+++ b/debian/isc-dhcp-relay.init.d
@@ -9,7 +9,7 @@
 # Should-Start:      $local_fs
 # Should-Stop:       $local_fs
 # Default-Start:     2 3 4 5
-# Default-Stop:
+# Default-Stop:      0 1 6
 # Short-Description: DHCP relay
 # Description:       Dynamic Host Configuration Protocol Relay
 ### END INIT INFO
diff --git a/debian/isc-dhcp-server.init.d b/debian/isc-dhcp-server.init.d
index 9be1e1a..83a30da 100644
--- a/debian/isc-dhcp-server.init.d
+++ b/debian/isc-dhcp-server.init.d
@@ -9,7 +9,7 @@
 # Should-Start:      $local_fs slapd $named
 # Should-Stop:       $local_fs slapd
 # Default-Start:     2 3 4 5
-# Default-Stop:
+# Default-Stop:      0 1 6
 # Short-Description: DHCP server
 # Description:       Dynamic Host Configuration Protocol Server
 ### END INIT INFO
diff --git a/debian/isc-dhcp-server.postinst b/debian/isc-dhcp-server.postinst
index 1cd4456..301a174 100644
--- a/debian/isc-dhcp-server.postinst
+++ b/debian/isc-dhcp-server.postinst
@@ -83,6 +83,11 @@ fi
 
 [ -x /sbin/restorecon ] && restorecon /var/lib/dhcp/dhcpd.leases
 
+init_script_error_handler()
+{
+	return 0
+}
+
 #DEBHELPER#
 
 exit 0
diff --git a/debian/isc-dhcp-server.postrm b/debian/isc-dhcp-server.postrm
index 07604a1..95f1886 100644
--- a/debian/isc-dhcp-server.postrm
+++ b/debian/isc-dhcp-server.postrm
@@ -1,7 +1,9 @@
-#!/bin/sh -e
+#!/bin/sh
 #
 #
 
+set -e
+
 case "$1" in
     remove)
 	# Nothing to do
@@ -25,6 +27,11 @@ case "$1" in
 	;;
 esac
 
+init_script_error_handler()
+{
+	return 0
+}
+
 #DEBHELPER#
 
 exit 0
diff --git a/debian/isc-dhcp-server.prerm b/debian/isc-dhcp-server.prerm
index b854f4f..e1299d6 100644
--- a/debian/isc-dhcp-server.prerm
+++ b/debian/isc-dhcp-server.prerm
@@ -1,8 +1,13 @@
-#!/bin/sh -e
+#!/bin/sh
 #
 #
 
-invoke-rc.d isc-dhcp-server stop
+set -e
+
+init_script_error_handler()
+{
+	return 0
+}
 
 #DEBHELPER#
 
diff --git a/debian/rules b/debian/rules
index e276c8d..5c96303 100755
--- a/debian/rules
+++ b/debian/rules
@@ -146,7 +146,8 @@ 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
+	dh_installinit -pisc-dhcp-server --error-handler=init_script_error_handler
+	dh_installinit -a -Nisc-dhcp-server
 	dh_installchangelogs
 	dh_installchangelogs -pisc-dhcp-server-ldap Changelog-LDAP 
 	dh_install -pisc-dhcp-server-ldap	

-- 
ISC DHCP packaging for Debian