[pkg-dhcp-commits] [isc-dhcp] 01/01: release 4.3.3-8

[Michael Gilbert]

This is an automated email from the git hooks/post-receive script.

mgilbert pushed a commit to branch master
in repository isc-dhcp.

commit f121779c9337ed3c57f50850d1451cdbb29db22b
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sat Feb 13 22:05:48 2016 +0000

    release 4.3.3-8
---
 debian/changelog              |  7 +++++++
 debian/isc-dhcp-server.init.d | 15 +++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a76399e..f7201b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+isc-dhcp (4.3.3-8) unstable; urgency=medium
+
+  * Fix typos in recent changes to the server init script.
+  * Support server configurations still using INTERFACES (closes: #813339).
+
+ -- Michael Gilbert <mgilbert at debian.org>  Sat, 13 Feb 2016 18:38:20 +0000
+
 isc-dhcp (4.3.3-7) unstable; urgency=medium
 
   * Migrate to dbgsym debug packages.
diff --git a/debian/isc-dhcp-server.init.d b/debian/isc-dhcp-server.init.d
index e057919..2f97d40 100644
--- a/debian/isc-dhcp-server.init.d
+++ b/debian/isc-dhcp-server.init.d
@@ -50,11 +50,11 @@ if [ -z "$DHCPDv6_PID" ]; then
 	DHCPDv6_PID=$(sed -n -e 's/^[ \t]*pid-file-name[ \t]*"\(.*\)"[ \t]*;.*$/\1/p' < "$DHCPDv6_CONF" 2>/dev/null | head -n 1)
 fi
 DHCPDv4_PID="${DHCPDv4_PID:-/var/run/dhcpd.pid}"
-DHCPDv6_PID="${DHCPDv4_PID:-/var/run/dhcpd6.pid}"
+DHCPDv6_PID="${DHCPDv6_PID:-/var/run/dhcpd6.pid}"
 
 test_config()
 {
-        VERSION="$1"
+	VERSION="$1"
 	CONF="$2"
 
 	if ! /usr/sbin/dhcpd -t $VERSION -q -cf "$CONF" > /dev/null 2>&1; then
@@ -99,7 +99,7 @@ start_daemon()
 	test_config "$VERSION" "$CONF"
 	log_daemon_msg "Starting $DESC" "$NAME"
 
-	if [ -e "$DHCPD_PID" ]; then
+	if [ -e "$PIDFILE" ]; then
 		log_failure_msg "dhcpd service already running (pid file $PIDFILE currenty exists)"
 		exit 1
 	fi
@@ -136,6 +136,13 @@ stop_daemon()
 
 case "$1" in
 	start)
+		if test -n "$INTERFACES" -a -z "$INTERFACESv4"; then
+                        echo "DHCPv4 interfaces are no longer set by the INTERFACES variable in" >&2
+                        echo "/etc/default/isc-dhcp-server.  Please use INTERFACESv4 instead." >&2
+                        echo "Migrating automatically for now, but this will go away in the future." >&2
+                        INTERFACESv4="$INTERFACES"
+		fi
+
 		if test -n "$INTERFACESv4"; then
 			start_daemon "-4" "$DHCPDv4_CONF" "$NAME4" \
 				"$DHCPDv4_PID" "$DESC4" "$INTERFACESv4"
@@ -166,7 +173,7 @@ case "$1" in
 		;;
 	*)
 		echo "Usage: $0 {start|stop|restart|force-reload|status}"
-		exit 1 
+		exit 1
 esac
 
 exit 0

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-dhcp/isc-dhcp.git