[pkg-dhcp-commits] [SCM] ISC DHCP packaging for Debian branch, master, updated. debian/4.2.4-3-3-gab8bbfb

[Michael Gilbert]

The following commit has been merged in the master branch:
commit 0cde5aeb92e0ea3f8974afd07db9d7f0d6f7959d
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sat Dec 15 19:22:27 2012 -0500

    Run exit hooks when "dhclient -1" fails

diff --git a/debian/patches/dhclient-exit-hook.patch b/debian/patches/dhclient-exit-hook.patch
new file mode 100644
index 0000000..c43d342
--- /dev/null
+++ b/debian/patches/dhclient-exit-hook.patch
@@ -0,0 +1,14 @@
+Description: Run exit hooks when "dhclient -1" fails (closes: #486520).
+Author: Martin Pitt <martin.pitt at ubuntu.com>
+Bug-Debian: http://bugs.debian.org/486520
+--- isc-dhcp-4.2.4.orig/client/dhclient.c
++++ isc-dhcp-4.2.4/client/dhclient.c
+@@ -2018,6 +2018,8 @@ void state_panic (cpp)
+ 		if (!quiet)
+ 			log_info ("Unable to obtain a lease on first try.%s",
+ 				  "  Exiting.");
++		script_init (client, "FAIL", (struct string_list *)0);
++		script_go (client);
+ 		exit (2);
+ 	}
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 517d7ab..287fcd0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ cve-2012-3570.patch
 cve-2012-3571.patch
 cve-2012-3954.patch
 cve-2012-3955.patch
+dhclient-exit-hook.patch

-- 
ISC DHCP packaging for Debian