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 | |
| parent | 79ca08a0ac2217563692e9182d9e636998428ba0 (diff) | |
| download | live-boot-5c1ee9f9c3a9c3ae4636533ca72f05649ad4b178.tar.gz live-boot-5c1ee9f9c3a9c3ae4636533ca72f05649ad4b178.zip | |
Merging casper 1.215.
| -rw-r--r-- | docs/ChangeLog.casper | 14 | ||||
| -rwxr-xr-x | scripts/live | 11 | ||||
| -rwxr-xr-x | scripts/live-bottom/24preseed | 7 |
3 files changed, 25 insertions, 7 deletions
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper index 62fe922..2bed515 100644 --- a/docs/ChangeLog.casper +++ b/docs/ChangeLog.casper @@ -1,3 +1,17 @@ +casper (1.215) lucid; urgency=low + + [ Mario Limonciello ] + * Support multiple preseed file/urlarguments on the kernel commandline + rather than just selecting the last one and going with that. + * debian/control: Set Vcs-Bzr. + + [ Jonathan Riddell ] + * Add scripts/casper-bottom/48enable_kubuntu_netbook and ubiquity- + hooks/48enable_kubuntu_netbook to enable Plasma Netbook workspace + for Kubuntu Netbook Remix + + -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 27 Jan 2010 13:55:42 +0000 + casper (1.214) lucid; urgency=low * 15autologin: simplify the code with escape character evaluation 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}" ;; */*=*) diff --git a/scripts/live-bottom/24preseed b/scripts/live-bottom/24preseed index 2536bd0..7dd6394 100755 --- a/scripts/live-bottom/24preseed +++ b/scripts/live-bottom/24preseed @@ -36,9 +36,12 @@ then chroot /root debconf-set-selections < /preseed.cfg fi -if [ -f "/root/${LOCATION}" ] +if [ -n "${LOCATIONS}" ] then - chroot /root debconf-set-selections < "/root/${LOCATION}" + for item in ${LOCATIONS} + do + chroot /root debconf-set-selections < "/root${ITEM}" + done fi if [ -n "${PRESEEDS}" ] |