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

diff --git a/scripts/live-bottom/24preseed b/scripts/live-bottom/24preseed
index f4b2db0..1f5c513 100755
--- a/scripts/live-bottom/24preseed
+++ b/scripts/live-bottom/24preseed
@@ -26,19 +26,23 @@ then
 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
+	live-set-selections /preseed.cfg
 fi
 
-if [ -f "/root/${LOCATION}" ]
+if [ -n "${LOCATIONS}" ]
 then
-	chroot /root debconf-set-selections < "/root/${LOCATION}"
+	for item in ${LOCATIONS}
+	do
+		live-set-selections "/root$item"
+	done
 fi
 
 if [ -n "${PRESEEDS}" ]
@@ -52,6 +56,23 @@ then
 	done
 fi
 
+if db_get preseed/early_command && [ "$RET" ]
+then
+	EARLY="$RET"
+	if db_get preseed/allow-network && [ "$RET" = true ]; then
+		start_network
+	fi
+
+	DEBIAN_HAS_FRONTEND= DEBCONF_REDIR= \
+	DEBIAN_FRONTEND=noninteractive \
+	sh -c "$EARLY"
+fi
+
+stop_network
+
+# Clear out debconf database backup files to save memory.
+rm -f /root/var/cache/debconf/*.dat-old
+
 log_end_msg
 
 exit 0