diff -Nru isc-dhcp-4.3.3/debian/changelog isc-dhcp-4.3.3/debian/changelog --- isc-dhcp-4.3.3/debian/changelog 2016-06-08 08:53:43.000000000 +0000 +++ isc-dhcp-4.3.3/debian/changelog 2016-09-23 21:09:46.000000000 +0000 @@ -1,3 +1,18 @@ +isc-dhcp (4.3.3-5ubuntu12.3) xenial; urgency=medium + + [ Mathieu Trudel-Lapierre ] + * debian/isc-dhcp-client.install: install new files for initramfs-tools + to their proper locations; from debian/initramfs-tools. (LP: #1621507) + + -- LaMont Jones Fri, 23 Sep 2016 15:09:46 -0600 + +isc-dhcp (4.3.3-5ubuntu12.2) xenial; urgency=medium + + * Don't assume IPv6 prefix length of 64 (LP: #1609898). + Pulled from debian commit c347ab8a43587164486ce1f104eedfd638594e59. + + -- Dan Streetman Thu, 04 Aug 2016 13:07:23 -0400 + isc-dhcp (4.3.3-5ubuntu12.1) xenial; urgency=medium * Fixed missing broadcast flag for Infiniband interfaces (LP: #1529815) diff -Nru isc-dhcp-4.3.3/debian/dhclient-script.linux isc-dhcp-4.3.3/debian/dhclient-script.linux --- isc-dhcp-4.3.3/debian/dhclient-script.linux 2016-01-13 15:39:44.000000000 +0000 +++ isc-dhcp-4.3.3/debian/dhclient-script.linux 2016-08-04 17:07:23.000000000 +0000 @@ -399,9 +399,9 @@ ;; BOUND6|RENEW6|REBIND6) - if [ "${new_ip6_address}" ] && [ "${new_ip6_prefixlen}" ]; then + if [ "${new_ip6_address}" ]; then # set leased IP - ip -6 addr add ${new_ip6_address}/${new_ip6_prefixlen} \ + ip -6 addr add ${new_ip6_address} \ dev ${interface} scope global fi @@ -415,23 +415,19 @@ ;; DEPREF6) - if [ -z "${cur_ip6_prefixlen}" ]; then - exit_with_hooks 2 - fi - # set preferred lifetime of leased IP to 0 - ip -6 addr change ${cur_ip6_address}/${cur_ip6_prefixlen} \ + ip -6 addr change ${cur_ip6_address} \ dev ${interface} scope global preferred_lft 0 ;; EXPIRE6|RELEASE6|STOP6) - if [ -z "${old_ip6_address}" ] || [ -z "${old_ip6_prefixlen}" ]; then + if [ -z "${old_ip6_address}" ]; then exit_with_hooks 2 fi # delete leased IP - ip -6 addr del ${old_ip6_address}/${old_ip6_prefixlen} \ + ip -6 addr del ${old_ip6_address} \ dev ${interface} ;; diff -Nru isc-dhcp-4.3.3/debian/initramfs-tools/lib/etc/dhcp/dhclient.conf isc-dhcp-4.3.3/debian/initramfs-tools/lib/etc/dhcp/dhclient.conf --- isc-dhcp-4.3.3/debian/initramfs-tools/lib/etc/dhcp/dhclient.conf 1970-01-01 00:00:00.000000000 +0000 +++ isc-dhcp-4.3.3/debian/initramfs-tools/lib/etc/dhcp/dhclient.conf 2016-09-14 19:20:18.000000000 +0000 @@ -0,0 +1,10 @@ +option rfc3442-classless-static-routes code 121 = array of unsigned integer 8; + +send host-name = gethostname(); +request subnet-mask, broadcast-address, time-offset, routers, + domain-name, domain-name-servers, domain-search, host-name, + dhcp6.name-servers, dhcp6.domain-search, dhcp6.fqdn, dhcp6.sntp-servers, + netbios-name-servers, netbios-scope, interface-mtu, + rfc3442-classless-static-routes, ntp-servers; + +timeout 30; diff -Nru isc-dhcp-4.3.3/debian/initramfs-tools/lib/etc/dhcp/dhclient-enter-hooks.d/config isc-dhcp-4.3.3/debian/initramfs-tools/lib/etc/dhcp/dhclient-enter-hooks.d/config --- isc-dhcp-4.3.3/debian/initramfs-tools/lib/etc/dhcp/dhclient-enter-hooks.d/config 1970-01-01 00:00:00.000000000 +0000 +++ isc-dhcp-4.3.3/debian/initramfs-tools/lib/etc/dhcp/dhclient-enter-hooks.d/config 2016-09-20 20:38:16.000000000 +0000 @@ -0,0 +1,56 @@ +#!/bin/sh + +echo "DEVICE=$interface" >> /run/net-$interface.conf + +case "$reason" in +BOUND) + echo "PROTO=dhcp" >> /run/net-$interface.conf + echo "IPV4PROTO=dhcp" >> /run/net-$interface.conf + echo "IPV4ADDR=$new_ip_address" >> /run/net-$interface.conf + echo "IPV4NETMASK=$new_subnet_mask" >> /run/net-$interface.conf + echo "IPV4BROADCAST=$new_broadcast_address" >> /run/net-$interface.conf + echo "IPV4GATEWAY=$new_routers" >> /run/net-$interface.conf + echo "IPV4DNS0=$new_domain_name_servers" >> /run/net-$interface.conf + echo "ROOTSERVER=$new_routers" >> /run/net-$interface.conf + if [ -n "$new_domain_search"]; then + echo "DOMAINSEARCH=$new_domain_search" >> /run/net-$interface.conf + fi + ;; +BOUND6) + echo "IPV6PROTO=dhcp6" >> /run/net-$interface.conf + echo "IPV6ADDR=$new_ip6_address" >> /run/net-$interface.conf + echo "IPV6NETMASK=$new_ip6_prefixlen" >> /run/net-$interface.conf + echo "IPV6DNS0=$new_dhcp6_name_servers" >> /run/net-$interface.conf + if [ -n "$new_dhcp6_domain_search"]; then + echo "IPV6DOMAINSEARCH=$new_dhcp6_domain_search" >> /run/net-$interface.conf + fi + ;; +esac + +if [ -n "$host_name"]; then + echo "HOSTNAME=$new_host_name" >> /run/net-$interface.conf +fi +if [ -n "$domain_name"]; then + echo "DNSDOMAIN=$new_domain_name" >> /run/net-$interface.conf +fi + +for prefix in '' 'cur_' 'new_' 'old_'; do + # loop over the DHCP variables passed to dhclient-script + for basevar in reason interface medium alias_ip_address \ + ip_address host_name network_number subnet_mask \ + broadcast_address routers static_routes \ + rfc3442_classless_static_routes \ + domain_name domain_search domain_name_servers \ + netbios_name_servers netbios_scope \ + ntp_servers \ + ip6_address ip6_prefix ip6_prefixlen \ + dhcp6_domain_search dhcp6_name_servers ; do + var="${prefix}${basevar}" + eval "content=\$$var" + + # show only variables with values set + if [ -n "${content}" ]; then + echo "$var='${content}'" >> /run/net-$interface.conf + fi + done +done diff -Nru isc-dhcp-4.3.3/debian/initramfs-tools/share/hooks/zz-dhclient isc-dhcp-4.3.3/debian/initramfs-tools/share/hooks/zz-dhclient --- isc-dhcp-4.3.3/debian/initramfs-tools/share/hooks/zz-dhclient 1970-01-01 00:00:00.000000000 +0000 +++ isc-dhcp-4.3.3/debian/initramfs-tools/share/hooks/zz-dhclient 2016-09-14 22:59:36.000000000 +0000 @@ -0,0 +1,28 @@ +#!/bin/sh + +PREREQ="" + +prereqs() +{ + echo "$PREREQ" +} + +case $1 in +prereqs) + prereqs + exit 0 + ;; +esac + +if [ ! -x /sbin/dhclient ]; then + exit 0 +fi + +. /usr/share/initramfs-tools/scripts/functions +. /usr/share/initramfs-tools/hook-functions + +copy_exec /bin/run-parts +copy_exec /sbin/dhclient +copy_exec /sbin/dhclient-script +cp -a /usr/lib/initramfs-tools/etc/dhcp/ $DESTDIR/etc/dhcp/ +mkdir -p $DESTDIR/var/lib/dhcp/ diff -Nru isc-dhcp-4.3.3/debian/isc-dhcp-client.install isc-dhcp-4.3.3/debian/isc-dhcp-client.install --- isc-dhcp-4.3.3/debian/isc-dhcp-client.install 2016-01-13 15:48:01.000000000 +0000 +++ isc-dhcp-4.3.3/debian/isc-dhcp-client.install 2016-09-15 16:19:09.000000000 +0000 @@ -5,3 +5,6 @@ debian/debug etc/dhcp debian/apparmor/sbin.dhclient etc/apparmor.d + +debian/initramfs-tools/share/hooks/zz-dhclient usr/share/initramfs-tools/hooks +debian/initramfs-tools/lib/etc usr/lib/initramfs-tools/