X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F24preseed;h=55fbfc333ab6d586064dafb14306d61e050def08;hb=bee74e59a03a763bccbbafcc4c000f3b83dccd34;hp=d71b441176c07733f0343879f1474a3fb7ff2259;hpb=ea5ccacffb14572b4800d14fc9eea23cad7ca893;p=live-boot-grml.git

diff --git a/scripts/live-bottom/24preseed b/scripts/live-bottom/24preseed
index d71b441..55fbfc3 100755
--- a/scripts/live-bottom/24preseed
+++ b/scripts/live-bottom/24preseed
@@ -1,24 +1,34 @@
-#! /bin/sh
+#!/bin/sh
 
-PREREQ=""
-DESCRIPTION="Loading preseed file..."
+#set -e
 
-. /scripts/live-functions
+# initramfs-tools header
 
-prereqs ()
+PREREQ=""
+
+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
+
+. /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}"