summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2008-03-21 07:46:43 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:44:53 +0100
commit0a3aef23e999382a9cd6400be54449f44aa596e0 (patch)
treea9881fd833932b664a74a48e4663cda420c44653
parent1df4b4ccb77a55e8e1dc758fb81691047ecfa0a7 (diff)
downloadlive-boot-0a3aef23e999382a9cd6400be54449f44aa596e0.tar.gz
live-boot-0a3aef23e999382a9cd6400be54449f44aa596e0.zip
Merging casper 1.120.
-rw-r--r--docs/ChangeLog.casper8
-rwxr-xr-xscripts/live4
2 files changed, 10 insertions, 2 deletions
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index da4cef2..3bdd78a 100644
--- 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
--- 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