X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F24preseed;h=f4b2db0075144b9b62ac65ed14775f1be6916917;hb=13040ad5e4f230cdfecd278a3bf134110fc48f87;hp=d71b441176c07733f0343879f1474a3fb7ff2259;hpb=3d52fbcb4fe70132ade14759d76573b471294800;p=live-boot-grml.git

diff --git a/scripts/live-bottom/24preseed b/scripts/live-bottom/24preseed
index d71b441..f4b2db0 100755
--- a/scripts/live-bottom/24preseed
+++ b/scripts/live-bottom/24preseed
@@ -1,35 +1,55 @@
-#! /bin/sh
+#!/bin/sh
 
-PREREQ=""
-DESCRIPTION="Loading preseed file..."
+#set -e
 
-. /scripts/live-functions
+# initramfs-tools header
+
+PREREQ=""
 
-prereqs ()
+prereqs()
 {
-	echo "$PREREQ"
+	echo "${PREREQ}"
 }
 
-case $1 in
-# get pre-requisites
-prereqs)
-	prereqs
-	exit 0
-	;;
+case "${1}" in
+	prereqs)
+		prereqs
+		exit 0
+		;;
 esac
 
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
 
-if [ -f "/root/${LOCATION}" ]; then
-    chroot /root debconf-set-selections < "/root/${LOCATION}"
+if [ -n "${NOPRESEED}" ]
+then
+	exit 0
 fi
 
-if [ -n "${PRESEEDS}" ]; then
-    for preseed in ${PRESEEDS}; do
-       question="${preseed%%=*}"
-               value="${preseed#*=}"
-               live-preseed /root "${question}" "${value}"
-       done
+. /scripts/live-functions
+
+log_begin_msg "Loading preseed file..."
+
+# live-initramfs script
+
+if [ -e /preseed.cfg ]
+then
+	chroot /root debconf-set-selections < /preseed.cfg
+fi
+
+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