X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Fcasper-bottom%2F24preseed;h=b4aac4c0f96180b14f16b9ea2faf8d2e684f90b7;hb=refs%2Ftags%2Fdebian%2F1.79%2Bdebian-1;hp=98a9864a6e31d6f1e85b087554a3bce53ccd5bfb;hpb=a4a7503df76005df67b006e1324004c808830c32;p=live-boot-grml.git

diff --git a/scripts/casper-bottom/24preseed b/scripts/casper-bottom/24preseed
index 98a9864..b4aac4c 100755
--- a/scripts/casper-bottom/24preseed
+++ b/scripts/casper-bottom/24preseed
@@ -3,7 +3,7 @@
 PREREQ=""
 DESCRIPTION="Loading preseed file..."
 
-. /scripts/functions
+. /scripts/casper-functions
 
 prereqs ()
 {
@@ -20,26 +20,16 @@ esac
 
 log_begin_msg "$DESCRIPTION"
 
-location=
-for x in $(cat /proc/cmdline); do
-	case $x in
-		preseed/file=*)
-			location="${x#preseed/file=}"
-			;;
-		*/*=*)
-			question="${x%%=*}"
-			value="${x#*=}"
-			casper-preseed /root "$question" "$value"
-			;;
-		locale=*)
-			value="${x#*=}"
-			casper-preseed /root debian-installer/locale "$value"
-			;;
-	esac
-done
-
-if [ "$location" ]; then
-	chroot /root debconf-set-selections < "/root$location"
+if [ -f "/root/${LOCATION}" ]; then
+    chroot /root debconf-set-selections < "/root/${LOCATION}"
+fi
+
+if [ -n "${PRESEEDS}" ]; then
+    for preseed in ${PRESEEDS}; do
+    	question="${preseed%%=*}"
+		value="${preseed#*=}"
+		casper-preseed /root "${question}" "${value}"
+	done
 fi
 
 log_end_msg