X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Fcasper-bottom%2F24preseed;h=cd5246717b7e65599965c624f50d6ee3164aa50a;hb=4bdaa2237c6ae923d1dd068e9024ebceca3f40d9;hp=b4aac4c0f96180b14f16b9ea2faf8d2e684f90b7;hpb=c972c6eea545add125883eaaeea459551e54589c;p=live-boot-grml.git

diff --git a/scripts/casper-bottom/24preseed b/scripts/casper-bottom/24preseed
index b4aac4c..cd52467 100755
--- a/scripts/casper-bottom/24preseed
+++ b/scripts/casper-bottom/24preseed
@@ -20,16 +20,29 @@ esac
 
 log_begin_msg "$DESCRIPTION"
 
-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
+location=
+for x in $(cat /proc/cmdline); do
+	case $x in
+		preseed/file=*)
+			location="${x#preseed/file=}"
+			;;
+		file=*)
+			location="${x#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"
 fi
 
 log_end_msg