diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/live | 11 | ||||
| -rwxr-xr-x | scripts/live-bottom/24preseed | 7 |
2 files changed, 11 insertions, 7 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}" ;; */*=*) 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}" ] |