From 3d52fbcb4fe70132ade14759d76573b471294800 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 23 Sep 2007 14:46:37 +0200
Subject: Adding live-initramfs 1.87.3-1.

---
 scripts/live-bottom/24preseed | 33 ++++++++++-----------------------
 1 file changed, 10 insertions(+), 23 deletions(-)

(limited to 'scripts/live-bottom/24preseed')

diff --git a/scripts/live-bottom/24preseed b/scripts/live-bottom/24preseed
index cd530ea..d71b441 100755
--- a/scripts/live-bottom/24preseed
+++ b/scripts/live-bottom/24preseed
@@ -20,29 +20,16 @@ esac
 
 log_begin_msg "$DESCRIPTION"
 
-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#*=}"
-			live-preseed /root "$question" "$value"
-			;;
-		locale=*)
-			value="${x#*=}"
-			live-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#*=}"
+               live-preseed /root "${question}" "${value}"
+       done
 fi
 
 log_end_msg
-- 
cgit v1.2.3