← Back to branch summary

~ubuntu-branches/ubuntu/karmic/ifupdown/karmic-proposed

« back to all changes in this revision

Viewing changes to keep-leases.diff

  • Committer: Bazaar Package Importer
  • Author(s): Scott James Remnant
  • Date: 2006-11-27 13:16:58 UTC
  • mfrom: (2.1.2 etch)
  • Revision ID: james.westby@ubuntu.com-20061127131658-qzuvhhaq6u1cxoek
Tags: 0.6.8ubuntu1
* Merge from debian unstable, remaining changes:
  - ship udev rules to call ifup
  - init script to bring up loopback seperately
  - ifstate file moved to /var/run/network/ifstate, no need to clean up
  - dhcp3 leases files moved to /var/lib/dhcp3

Show diffs side-by-side

added added

removed removed

Lines of Context:
keep-leases.diff
 
1
 
 
2
+ifupdown (0.6.7ubuntu2) dapper; urgency=low
 
3
+
 
4
+  * Change the dhclient3 leases path to /var/lib/dhcp3 so the leases survive
 
5
+    a reboot.  (Ubuntu: #18148)
 
6
+
 
7
+ -- Scott James Remnant <scott@ubuntu.com>  Wed, 23 Nov 2005 16:11:30 +0000
 
8
+
 
9
 
 
10
diff -pruN 0.6.7/ifupdown.nw 0.6.7ubuntu7/ifupdown.nw
 
11
--- 0.6.7/ifupdown.nw   2005-04-05 18:31:29.000000000 +0100
 
12
+++ 0.6.7ubuntu7/ifupdown.nw    2006-01-26 15:56:05.000000000 +0000
 
13
@@ -3920,7 +3962,7 @@ method dhcp
 
14
 
 
15
   up
 
16
     [[ifconfig %iface% hw %hwaddress%]]
 
17
-    dhclient3 -pf /var/run/dhclient.%iface%.pid -lf /var/run/dhclient.%iface%.leases %iface% \
 
18
+    dhclient3 -pf /var/run/dhclient.%iface%.pid -lf /var/lib/dhcp3/dhclient.%iface%.leases %iface% \
 
19
         if (execable("/sbin/dhclient3"))
 
20
     dhclient -e -pf /var/run/dhclient.%iface%.pid -lf /var/run/dhclient.%iface%.leases %iface% \
 
21
         elsif (execable("/sbin/dhclient"))
 
22
@@ -3934,7 +3976,7 @@ method dhcp
 
23
         elsif (execable("/sbin/dhcpcd"))
 
24
 
 
25
   down
 
26
-    dhclient3 -r -pf /var/run/dhclient.%iface%.pid -lf /var/run/dhclient.%iface%.leases %iface% \
 
27
+    dhclient3 -r -pf /var/run/dhclient.%iface%.pid -lf /var/lib/dhcp3/dhclient.%iface%.leases %iface% \
 
28
         if (execable("/sbin/dhclient3"))
 
29
     cat /var/run/dhclient.%iface%.pid | xargs -i kill -TERM {} \
 
30
         elsif (execable("/sbin/dhclient"))
 
31
diff -pruN 0.6.7/inet.defn 0.6.7ubuntu7/inet.defn
 
32
--- 0.6.7/inet.defn     2005-05-02 14:58:08.000000000 +0100
 
33
+++ 0.6.7ubuntu7/inet.defn      2006-01-26 15:59:36.000000000 +0000
 
34
@@ -75,7 +75,7 @@ method dhcp
 
35
 
 
36
   up
 
37
     [[ifconfig %iface% hw %hwaddress%]]
 
38
-    dhclient3 -pf /var/run/dhclient.%iface%.pid -lf /var/run/dhclient.%iface%.leases %iface% \
 
39
+    dhclient3 -pf /var/run/dhclient.%iface%.pid -lf /var/lib/dhcp3/dhclient.%iface%.leases %iface% \
 
40
         if (execable("/sbin/dhclient3"))
 
41
     dhclient -e -pf /var/run/dhclient.%iface%.pid -lf /var/run/dhclient.%iface%.leases %iface% \
 
42
         elsif (execable("/sbin/dhclient"))
 
43
@@ -89,7 +89,7 @@ method dhcp
 
44
         elsif (execable("/sbin/dhcpcd"))
 
45
 
 
46
   down
 
47
-    dhclient3 -r -pf /var/run/dhclient.%iface%.pid -lf /var/run/dhclient.%iface%.leases %iface% \
 
48
+    dhclient3 -r -pf /var/run/dhclient.%iface%.pid -lf /var/lib/dhcp3/dhclient.%iface%.leases %iface% \
 
49
         if (execable("/sbin/dhclient3"))
 
50
     cat /var/run/dhclient.%iface%.pid | xargs -i kill -TERM {} \
 
51
         elsif (execable("/sbin/dhclient"))