diff -u isc-dhcp-4.1.ESV-R4/debian/changelog isc-dhcp-4.1.ESV-R4/debian/changelog --- isc-dhcp-4.1.ESV-R4/debian/changelog +++ isc-dhcp-4.1.ESV-R4/debian/changelog @@ -1,3 +1,11 @@ +isc-dhcp (4.1.ESV-R4-0ubuntu5) precise; urgency=low + + * When dhclient is called with -1, exit on failure to get a lease only + when getting the initial lease. Once backgrounded, behave exactly like + in normal mode. (LP: #974284) + + -- Stéphane Graber Tue, 10 Apr 2012 14:19:23 +0200 + isc-dhcp (4.1.ESV-R4-0ubuntu4) precise; urgency=low * debian/apparmor-profile.dhcpd: diff -u isc-dhcp-4.1.ESV-R4/debian/patches/00list isc-dhcp-4.1.ESV-R4/debian/patches/00list --- isc-dhcp-4.1.ESV-R4/debian/patches/00list +++ isc-dhcp-4.1.ESV-R4/debian/patches/00list @@ -28,0 +29,3 @@ + +# LP: #974284 +onetry_retry_after_initial_success only in patch2: unchanged: --- isc-dhcp-4.1.ESV-R4.orig/debian/patches/onetry_retry_after_initial_success +++ isc-dhcp-4.1.ESV-R4/debian/patches/onetry_retry_after_initial_success @@ -0,0 +1,22 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## onetry_retry_after_initial_success.dpatch by Stéphane Graber +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Deal with the fact that the loopback interface isn't checsummed by Linux + +@DPATCH@ +diff -urNad isc-dhcp~/client/dhclient.c isc-dhcp/client/dhclient.c +--- isc-dhcp~/client/dhclient.c 2012-02-20 13:05:01 +0000 ++++ isc-dhcp/client/dhclient.c 2012-04-10 12:17:46 +0000 +@@ -2002,6 +2002,10 @@ + exit (2); + } + ++ /* Ubuntu wants dhclient -1 to still try to get a new lease in the ++ background after a DHCP server failure. */ ++ onetry = 0 ++ + log_info ("No working leases in persistent database - sleeping."); + script_init (client, "FAIL", (struct string_list *)0); + if (client -> alias) +