Merging casper 1.120.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index da4cef2..3bdd78a 100644 (file)
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,11 @@
+casper (1.120) hardy; urgency=low
+
+  * Use dhclient directly instead of ifupdown for the url= kernel cmdline
+    argument so that we don't have to worry about the interfaces file
+    propagating to the installed system.
+
+ -- Evan Dandrea <evand@ubuntu.com>  Tue, 11 Mar 2008 13:08:08 -0400
+
 casper (1.119) hardy; urgency=low
 
   [ Luke Yelavich ]

diff --git a/scripts/live b/scripts/live
index 6494234..03905b5 100755 (executable)
--- a/scripts/live
+++ b/scripts/live
@@ -322,9 +322,9 @@ Arguments ()
                                mount -n -o bind /dev /root/dev
 
                                mkdir -p /root/var/run/network
-                               chroot /root ifup -a
+                               chroot /root dhclient eth0
                                chroot /root wget -P /tmp "${location}"
-                               chroot /root ifdown -a
+                               chroot /root ifconfig eth0 down
 
                                umount /root/sys
                                umount /root/proc