X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F24preseed;h=85c6494406ffd820838cce08b97e9e32a37aecfe;hb=10819a70f6f196e97d1d0e82caf4f4afb15d6f4b;hp=3d0bdaf92494fb80f4fd26b2c52e24734041a558;hpb=56ac3ff5ec3730d0dcf04d5af7145446a0143b9b;p=live-boot-grml.git

diff --git a/scripts/live-bottom/24preseed b/scripts/live-bottom/24preseed
index 3d0bdaf..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,10 +55,12 @@ then
 	done
 fi
 
-reply="$(echo "GET preseed/early_command" | chroot /root debconf-communicate -fnoninteractive casper)"
-if [ "${reply#0 }" != "$reply" ]; then
-       reply="${reply#0 }"
-       sh -c "$reply"
+reply="$(echo "GET preseed/early_command" | chroot /root debconf-communicate -fnoninteractive live-boot)"
+
+if [ "${reply#0 }" != "${reply}" ]
+then
+	reply="${reply#0 }"
+	sh -c "${reply}"
 fi
 
 # Clear out debconf database backup files to save memory.