X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F24preseed;h=85c6494406ffd820838cce08b97e9e32a37aecfe;hb=e0f8a3e9b2224c661d53c19948974279dc9d1c07;hp=a8f5a46070fc9d52cdb09b2d8d000187bc23442d;hpb=1e0a488b895cd6e2bf7141aa730f17da42a490f7;p=live-boot-grml.git

diff --git a/scripts/live-bottom/24preseed b/scripts/live-bottom/24preseed
index a8f5a46..85c6494 100755
--- a/scripts/live-bottom/24preseed
+++ b/scripts/live-bottom/24preseed
@@ -18,7 +18,7 @@ case "${1}" in
 		;;
 esac
 
-# live-initramfs header
+# live-boot header
 
 if [ -n "${NOPRESEED}" ]
 then
@@ -27,18 +27,21 @@ fi
 
 . /scripts/live-functions
 
-log_begin_msg "Loading preseed file..."
+log_begin_msg "Loading preseed file"
 
-# live-initramfs script
+# live-boot script
 
 if [ -e /preseed.cfg ]
 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}" ]
@@ -52,7 +55,7 @@ then
 	done
 fi
 
-reply="$(echo "GET preseed/early_command" | chroot /root debconf-communicate -fnoninteractive live-initramfs)"
+reply="$(echo "GET preseed/early_command" | chroot /root debconf-communicate -fnoninteractive live-boot)"
 
 if [ "${reply#0 }" != "${reply}" ]
 then