[pkg-dhcp-commits] [isc-dhcp] 04/11: drop support for dhcp3
Michael Gilbert
mgilbert at moszumanska.debian.org
Mon May 11 00:55:01 UTC 2015
This is an automated email from the git hooks/post-receive script.
mgilbert pushed a commit to branch master
in repository isc-dhcp.
commit b8cf553ea580d0838314f6dae29d9176dcba77e7
Author: Michael Gilbert <mgilbert at debian.org>
Date: Mon May 11 00:38:08 2015 +0000
drop support for dhcp3
---
debian/dhclient.conf | 5 ++-
debian/isc-dhcp-client.postinst | 32 -------------------
debian/isc-dhcp-client.preinst | 71 -----------------------------------------
debian/isc-dhcp-server.postinst | 26 +--------------
4 files changed, 3 insertions(+), 131 deletions(-)
diff --git a/debian/dhclient.conf b/debian/dhclient.conf
index 431fafd..f33f92f 100644
--- a/debian/dhclient.conf
+++ b/debian/dhclient.conf
@@ -1,5 +1,4 @@
-# Configuration file for /sbin/dhclient, which is included in Debian's
-# dhcp3-client package.
+# Configuration file for /sbin/dhclient.
#
# This is a sample configuration file for dhclient. See dhclient.conf's
# man page for more information about the syntax of this file
@@ -30,7 +29,7 @@ request subnet-mask, broadcast-address, time-offset, routers,
#reboot 10;
#select-timeout 5;
#initial-interval 2;
-#script "/etc/dhcp3/dhclient-script";
+#script "/sbin/dhclient-script";
#media "-link0 -link1 -link2", "link0 link1";
#reject 192.33.137.209;
diff --git a/debian/isc-dhcp-client.postinst b/debian/isc-dhcp-client.postinst
deleted file mode 100644
index 4e3f5d3..0000000
--- a/debian/isc-dhcp-client.postinst
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-#
-#
-
-set -e
-
-# Source debconf library.
-. /usr/share/debconf/confmodule
-
-case "$1" in
- configure)
- if [ ! -e /var/lib/dhcp/dhclient.leases ]; then
- if test -e /var/lib/dhcp3/dhclient.leases; then
- cp /var/lib/dhcp3/dhclient.leases /var/lib/dhcp/dhclient.leases
- else
- touch /var/lib/dhcp/dhclient.leases
- fi
- fi
-
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- exit 0
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 0
- ;;
-esac
-
-#DEBHELPER#
diff --git a/debian/isc-dhcp-client.preinst b/debian/isc-dhcp-client.preinst
deleted file mode 100644
index ab92ac3..0000000
--- a/debian/isc-dhcp-client.preinst
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- install|upgrade)
- # if the /etc/dhclient.conf from dhcp-client was modified,
- # bring it forward to /etc/dhcp3/dhclient.conf, but in a way not
- # to upset dpkg about a changed conffile
- if [ ! -e /etc/dhcp3/dhclient.conf ] && [ -e /etc/dhclient.conf ] && \
- ! >/dev/null 2>&1 md5sum -c - <<-EOF; then
- 10830c7543724cfd36f10dd87a5f98eb /etc/dhclient.conf
- EOF
- mkdir -p /etc/dhcp3
- cp /etc/dhclient.conf /etc/dhcp3/dhclient.conf.oldconfig
- fi
-
- # handle lingering dhclient.conf from lenny (this can be safely removed
- # after the wheezy release)
- if [ -e /etc/dhcp/dhclient.conf ] && \
- [ "`md5sum /etc/dhcp/dhclient.conf | awk '{print $1;}'`" = 6e3910d75cd5cde0042ecb6d48492ae9 ]; then
- sed -i -e 's/rfc3442-classless-static-routes;/rfc3442-classless-static-routes, ntp-servers;/' /etc/dhcp/dhclient.conf
- fi
-
- # We renamed debug-enter to debug - handle the transition
- if [ ! -e /etc/dhcp3/dhclient-enter-hooks.d/debug ] && \
- [ -e /etc/dhcp3/dhclient-enter-hooks.d/debug-enter ]; then
- mv /etc/dhcp3/dhclient-enter-hooks.d/debug-enter \
- /etc/dhcp3/dhclient-enter-hooks.d/debug
- else
- rm -f /etc/dhcp3/dhclient-enter-hooks.d/debug-enter
- fi
-
- # We renamed debug-exit to debug - handle the transition
- if [ ! -e /etc/dhcp3/dhclient-exit-hooks.d/debug ] && \
- [ -e /etc/dhcp3/dhclient-exit-hooks.d/debug-exit ]; then
- mv /etc/dhcp3/dhclient-exit-hooks.d/debug-exit \
- /etc/dhcp3/dhclient-exit-hooks.d/debug
- else
- rm -f /etc/dhcp3/dhclient-exit-hooks.d/debug-exit
- fi
-
- # We moved /etc/dhcp3/dhclient-script to /sbin in 3.0.4-2
- if dpkg --compare-versions "$2" lt-nl "3.0.4-2"; then
- if [ -e /etc/dhcp3/dhclient-script ]; then
- if >/dev/null 2>&1 md5sum -c - <<-EOF; then
- 2b18b5c59b26d00aa115716b3da2ed26 /etc/dhcp3/dhclient-script
- EOF
- rm -f /etc/dhcp3/dhclient-script
- fi
- fi
- fi
- ;;
-
- abort-upgrade)
- ;;
-
- *)
- echo "preinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/debian/isc-dhcp-server.postinst b/debian/isc-dhcp-server.postinst
index ab0b984..4a77a52 100644
--- a/debian/isc-dhcp-server.postinst
+++ b/debian/isc-dhcp-server.postinst
@@ -74,31 +74,7 @@ fi
# ------------------------- Debconf questions end ---------------------
db_stop
-if [ ! -e /var/lib/dhcp/dhcpd.leases ]; then
- if test -e /var/lib/dhcp3/dhcpd.leases; then
- cp /var/lib/dhcp3/dhcpd.leases /var/lib/dhcp/dhcpd.leases
- else
- touch /var/lib/dhcp/dhcpd.leases
- fi
-fi
-
-# If we're upgrading from dhcp3, copy the config and leases over to the new
-# locations
-if [ -z "$2" ]; then
- if [ -f /etc/dhcp3/dhcpd.conf ]; then
- cp /etc/dhcp3/dhcpd.conf /etc/dhcp/dhcpd.conf
- fi
- if [ -f /var/lib/dhcp3/dhcpd.leases ]; then
- cp /var/lib/dhcp3/dhcpd.leases /var/lib/dhcp/dhcpd.leases
- fi
-fi
-
-[ -x /sbin/restorecon ] && restorecon /var/lib/dhcp/dhcpd.leases
-
-init_script_error_handler()
-{
- return 0
-}
+restorecon /var/lib/dhcp/dhcpd.leases || true
#DEBHELPER#
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-dhcp/isc-dhcp.git
More information about the pkg-dhcp-commits
mailing list