X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F24preseed;h=f4b2db0075144b9b62ac65ed14775f1be6916917;hb=cb896241d0ec8eb2bba0cecd11de3500869176a6;hp=1e80a17369c5e5e7c962c5f23c8bddb94482bd13;hpb=cdb98bbbdc41b29c6b94dc5aed36393daec84cf8;p=live-boot-grml.git

diff --git a/scripts/live-bottom/24preseed b/scripts/live-bottom/24preseed
index 1e80a17..f4b2db0 100755
--- a/scripts/live-bottom/24preseed
+++ b/scripts/live-bottom/24preseed
@@ -20,22 +20,36 @@ esac
 
 # live-initramfs header
 
+if [ -n "${NOPRESEED}" ]
+then
+	exit 0
+fi
+
 . /scripts/live-functions
 
 log_begin_msg "Loading preseed file..."
 
 # live-initramfs script
 
-if [ -f "/root/${LOCATION}" ]; then
-    chroot /root debconf-set-selections < "/root/${LOCATION}"
+if [ -e /preseed.cfg ]
+then
+	chroot /root debconf-set-selections < /preseed.cfg
 fi
 
-if [ -n "${PRESEEDS}" ]; then
-    for preseed in ${PRESEEDS}; do
-       question="${preseed%%=*}"
-               value="${preseed#*=}"
-               live-preseed /root "${question}" "${value}"
-       done
+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