[pkg-dhcp-commits] [SCM] ISC DHCP packaging for Debian branch, master, updated. debian/4.1.1-P1-16.1-26-g4a2456e
Andrew Pollock
apollock at debian.org
Thu Aug 25 06:19:41 UTC 2011
The following commit has been merged in the master branch:
commit 44a483931171a8980b7e1a43c9f041d2b8d428b2
Author: Andrew Pollock <apollock at debian.org>
Date: Wed Aug 24 22:24:09 2011 -0700
Add support for stateless DHCPv6
Patch from Colin Watson for #632888
diff --git a/debian/changelog b/debian/changelog
index 4df2483..356dbc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,10 @@ isc-dhcp (4.2.2-1) unstable; urgency=low
* debian/isc-dhcp-server-ldap.docs: update for new location of documentation
* debian/rules: added build-arch and build-indep targets
* debian/rules: applied patch from Kees Cook to call dh_link (closes: #614992)
+ * debian/dhclient-script.linux: applied patch from Colin Watson to make
+ dhclient-script support stateless DHCPv6 (closes: #632888)
- -- Andrew Pollock <apollock at debian.org> Wed, 24 Aug 2011 22:21:28 -0700
+ -- Andrew Pollock <apollock at debian.org> Wed, 24 Aug 2011 22:23:54 -0700
isc-dhcp (4.1.1-P1-18) unstable; urgency=low
diff --git a/debian/dhclient-script.linux b/debian/dhclient-script.linux
index 624a17e..adaf640 100644
--- a/debian/dhclient-script.linux
+++ b/debian/dhclient-script.linux
@@ -318,14 +318,12 @@ case "$reason" in
;;
BOUND6|RENEW6|REBIND6)
- if [ -z "${new_ip6_address}" ] || [ -z "${new_ip6_prefixlen}" ]; then
- exit_with_hooks 2
+ if [ "${new_ip6_address}" ] && [ "${new_ip6_prefixlen}" ]; then
+ # set leased IP
+ ip -6 addr add ${new_ip6_address}/${new_ip6_prefixlen} \
+ dev ${interface} scope global
fi
- # set leased IP
- ip -6 addr add ${new_ip6_address}/${new_ip6_prefixlen} \
- dev ${interface} scope global
-
# update /etc/resolv.conf
if [ "${reason}" = BOUND6 ] ||
[ "${new_dhcp6_name_servers}" != "${old_dhcp6_name_servers}" ] ||
--
ISC DHCP packaging for Debian
More information about the pkg-dhcp-commits
mailing list