← Back to branch summary

~ubuntu-branches/ubuntu/quantal/isc-dhcp/quantal-proposed

« back to all changes in this revision

Viewing changes to debian/patches/onetry_retry_after_initial_success

  • Committer: Stéphane Graber
  • Date: 2012-09-12 21:30:23 UTC
  • Revision ID: stgraber@ubuntu.com-20120912213023-01ut0h1qsa7dazmv
Set onetry = 0 early enough to actually work. (LP: #974284)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/onetry_retry_after_initial_success
7
7
@DPATCH@
8
8
Index: isc-dhcp/client/dhclient.c
9
9
===================================================================
10
 
--- isc-dhcp.orig/client/dhclient.c     2012-06-22 15:04:12.774627908 -0400
11
 
+++ isc-dhcp/client/dhclient.c  2012-06-22 15:04:23.866628220 -0400
12
 
@@ -2033,6 +2033,10 @@
13
 
                exit (2);
 
10
--- isc-dhcp.orig/client/dhclient.c     2012-09-11 16:03:45.859279971 -0400
 
11
+++ isc-dhcp/client/dhclient.c  2012-09-11 18:31:34.347790135 -0400
 
12
@@ -2024,6 +2024,10 @@
 
13
                        loop = client -> active;
14
14
        }
15
15
 
16
16
+       /* Ubuntu wants dhclient -1 to still try to get a new lease in the
17
17
+          background after a DHCP server failure. */
18
18
+       onetry = 0;
19
19
+
20
 
        log_info ("No working leases in persistent database - sleeping.");
21
 
        script_init (client, "FAIL", (struct string_list *)0);
22
 
        if (client -> alias)
 
20
        /* No leases were available, or what was available didn't work, so
 
21
           tell the shell script that we failed to allocate an address,
 
22
           and try again later. */