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

diff --git a/scripts/live-bottom/24preseed b/scripts/live-bottom/24preseed
index 1e80a17..9a77ef5 100755
--- a/scripts/live-bottom/24preseed
+++ b/scripts/live-bottom/24preseed
@@ -20,24 +20,50 @@ esac
 
 # live-initramfs header
 
+if [ -n "${NOPRESEED}" ]
+then
+	exit 0
+fi
+
 . /scripts/live-functions
+load_confmodule
 
-log_begin_msg "Loading preseed file..."
+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
+	live-set-selections /preseed.cfg
+fi
+
+if [ -n "${LOCATIONS}" ]
+then
+	for item in ${LOCATIONS}
+	do
+		live-set-selections "/root$item"
+	done
 fi
 
-if [ -n "${PRESEEDS}" ]; then
-    for preseed in ${PRESEEDS}; do
-       question="${preseed%%=*}"
-               value="${preseed#*=}"
-               live-preseed /root "${question}" "${value}"
-       done
+if [ -n "${PRESEEDS}" ]
+then
+	for preseed in ${PRESEEDS}
+	do
+		question="${preseed%%=*}"
+		value="${preseed#*=}"
+
+		live-preseed /root "${question}" "${value}"
+	done
+fi
+
+if db_get preseed/early_command && [ "$RET" ]
+then
+	sh -c "$RET"
 fi
 
+# Clear out debconf database backup files to save memory.
+rm -f /root/var/cache/debconf/*.dat-old
+
 log_end_msg
 
 exit 0