Source: ifupdown
Version: 0.7~rc2+experimental
Author: Guillem Jover <guillem@debian.org>
Status: sent
Debbug: 246621
Description:
 Do not release the current DHCP lease on interface shutdown when
 using isc-dhcp-client, by passing -x instead of -r.
 .
 Breaks old isc-dhcp-client versions << 4.0.0 not supporting -x.


diff -Naur ifupdown-0.7~rc2+experimental/debian/changelog ifupdown-0.7~rc2+experimental-lease/debian/changelog
--- ifupdown-0.7~rc2+experimental/debian/changelog	2012-04-25 00:38:04.000000000 +0200
+++ ifupdown-0.7~rc2+experimental-lease/debian/changelog	2012-05-02 11:46:07.201292138 +0200
@@ -1,3 +1,12 @@
+ifupdown (0.7~rc2+experimental+nmu1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Do not release the current DHCP lease on interface shutdown when
+    using isc-dhcp-client, by passing -x instead of -r. (Closes: #246621)
+    Breaks old isc-dhcp-client versions << 4.0.0 not supporting -x.
+
+ -- Guillem Jover <guillem@debian.org>  Wed, 02 May 2012 11:43:41 +0200
+
 ifupdown (0.7~rc2+experimental) experimental; urgency=low
 
   * Try to bring hotplug interfaces up on initscript restart
diff -Naur ifupdown-0.7~rc2+experimental/debian/control ifupdown-0.7~rc2+experimental-lease/debian/control
--- ifupdown-0.7~rc2+experimental/debian/control	2012-04-25 00:37:27.000000000 +0200
+++ ifupdown-0.7~rc2+experimental-lease/debian/control	2012-05-02 11:42:38.512257396 +0200
@@ -12,6 +12,7 @@
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${net:Depends}, ${shlibs:Depends}, ${misc:Depends}, lsb-base, initscripts (>= 2.88dsf-13.3)
+Breaks: isc-dhcp-client (<< 4.0.0)
 Suggests: isc-dhcp-client | dhcp-client, ppp, rdnssd, ${net:Suggests}
 Replaces: netbase (<= 4.47)
 Conflicts: dhcp-client (<< 3.0)
diff -Naur ifupdown-0.7~rc2+experimental/ifupdown.nw ifupdown-0.7~rc2+experimental-lease/ifupdown.nw
--- ifupdown-0.7~rc2+experimental/ifupdown.nw	2012-04-25 00:37:27.000000000 +0200
+++ ifupdown-0.7~rc2+experimental-lease/ifupdown.nw	2012-05-02 11:32:06.805124913 +0200
@@ -4711,7 +4711,7 @@
         elsif (execable("/sbin/dhcpcd"))
 
   down
-    dhclient -v -r -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases %iface% \
+    dhclient -v -x -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases %iface% \
         if (execable("/sbin/dhclient"))
     dhclient3 -r -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp3/dhclient.%iface%.leases %iface% \
         elsif (execable("/sbin/dhclient3"))
@@ -4937,7 +4937,7 @@
         if (execable("/sbin/dhclient"))
 
   down
-    dhclient -6 -r -pf /run/dhclient6.%iface%.pid -lf /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
+    dhclient -6 -x -pf /run/dhclient6.%iface%.pid -lf /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
         if (execable("/sbin/dhclient"))
     ip link set dev %iface% down \
 		if (iface_is_link())
@@ -5187,7 +5187,7 @@
         elsif (execable("/sbin/dhcpcd"))
 
   down
-    dhclient -v -r -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases %iface% \
+    dhclient -v -x -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases %iface% \
         if (execable("/sbin/dhclient"))
     dhclient3 -r -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp3/dhclient.%iface%.leases %iface% \
         elsif (execable("/sbin/dhclient3"))
@@ -5266,7 +5266,7 @@
         if (execable("/sbin/dhclient"))
 
   down
-    dhclient -6 -r -pf /run/dhclient6.%iface%.pid -lf /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
+    dhclient -6 -x -pf /run/dhclient6.%iface%.pid -lf /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
         if (execable("/sbin/dhclient"))
     ifconfig %iface% down