diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-05-01 13:05:58 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:48:09 +0100 |
| commit | 5c1ee9f9c3a9c3ae4636533ca72f05649ad4b178 (patch) | |
| tree | f90fcadd30586724fed1fb2bbc191849f36e64f7 /scripts/live | |
| parent | 79ca08a0ac2217563692e9182d9e636998428ba0 (diff) | |
| download | live-boot-5c1ee9f9c3a9c3ae4636533ca72f05649ad4b178.tar.gz live-boot-5c1ee9f9c3a9c3ae4636533ca72f05649ad4b178.zip | |
Merging casper 1.215.
Diffstat (limited to 'scripts/live')
| -rwxr-xr-x | scripts/live | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/scripts/live b/scripts/live index 76b0be4..3ef4ef0 100755 --- a/scripts/live +++ b/scripts/live @@ -46,6 +46,7 @@ fi Arguments () { PRESEEDS="" + LOCATIONS="" for ARGUMENT in $(cat /proc/cmdline) do @@ -418,8 +419,8 @@ Arguments () ;; preseed/file=*|file=*) - LOCATION="${ARGUMENT#*=}" - export LOCATION + LOCATIONS="${ARGUMENT#*=} ${LOCATIONS}" + export LOCATIONS ;; nopreseed) @@ -428,7 +429,7 @@ Arguments () ;; url=*) - location="${ARGUMENT#url=}" + URL_LOCATION="${ARGUMENT#url=}" mount -o bind /sys /root/sys mount -o bind /proc /root/proc @@ -436,14 +437,14 @@ Arguments () mkdir -p /root/var/run/network [ "${NETBOOT}" ] || chroot /root dhclient eth0 - chroot /root wget -P /tmp "${location}" + chroot /root wget -P /tmp "${URL_LOCATION}" [ "${NETBOOT}" ] || chroot /root ifconfig eth0 down umount /root/sys umount /root/proc umount /root/dev - LOCATION="/tmp/$(basename "${location}")" + LOCATIONS="/tmp/$(basename ${URL_LOCATION}) ${LOCATIONS}" ;; */*=*) |