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

diff --git a/scripts/live-bottom/24preseed b/scripts/live-bottom/24preseed
index 55fbfc3..9a77ef5 100755
--- a/scripts/live-bottom/24preseed
+++ b/scripts/live-bottom/24preseed
@@ -20,28 +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 [ -e /preseed.cfg ]; then
-       chroot /root debconf-set-selections < /preseed.cfg
+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 [ -f "/root/${LOCATION}" ]; then
-    chroot /root debconf-set-selections < "/root/${LOCATION}"
+if [ -n "${PRESEEDS}" ]
+then
+	for preseed in ${PRESEEDS}
+	do
+		question="${preseed%%=*}"
+		value="${preseed#*=}"
+
+		live-preseed /root "${question}" "${value}"
+	done
 fi
 
-if [ -n "${PRESEEDS}" ]; then
-    for preseed in ${PRESEEDS}; do
-       question="${preseed%%=*}"
-               value="${preseed#*=}"
-               live-preseed /root "${question}" "${value}"
-       done
+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