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

[Andrew Pollock]

The following commit has been merged in the master branch:
commit 4e0319db231cf47711fe29bbcbe1da07a5ce9380
Author: Andrew Pollock <apollock at debian.org>
Date:   Mon Jun 7 19:48:10 2010 -0700

    Go back to not specifying any stop runlevels, fix update-rc.d invocation
    
    This should hopefully be the last change to correct mismatch warning messages.

diff --git a/debian/changelog b/debian/changelog
index 9c46dc2..61506c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+isc-dhcp (4.1.1-P1-2) experimental; urgency=low
+
+  * debian/isc-dhcp-{server,relay}.init: go back to not mentioning any
+    runlevels for Default-Stop
+  * debian/isc-dhcp-server.postinst: don't specify any runlevels for stop
+    scripts when invoking update-rc.d
+
+ -- Andrew Pollock <apollock at debian.org>  Mon, 07 Jun 2010 19:41:25 -0700
+
 isc-dhcp (4.1.1-P1-1) experimental; urgency=low
 
   * New Upstream Version
diff --git a/debian/isc-dhcp-relay.init.d b/debian/isc-dhcp-relay.init.d
index 6526ba0..4fd6622 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:      0 1 6
+# Default-Stop:
 # 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 9f874d7..3220fe9 100644
--- a/debian/isc-dhcp-server.init.d
+++ b/debian/isc-dhcp-server.init.d
@@ -9,7 +9,7 @@
 # Should-Start:      $local_fs slapd
 # Should-Stop:       $local_fs slapd
 # Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
+# Default-Stop:
 # 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 4db88ca..14ad73c 100644
--- a/debian/isc-dhcp-server.postinst
+++ b/debian/isc-dhcp-server.postinst
@@ -84,7 +84,7 @@ fi
 
 [ -x /sbin/restorecon ] && restorecon /var/lib/dhcp/dhcpd.leases
 
-update-rc.d isc-dhcp-server start 40 2 3 4 5 . stop 40 1 . >/dev/null
+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

-- 
ISC DHCP packaging for Debian