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=2536bd0a3410f3523de7c0ae6c941825ab954a16;hpb=f4238ae20312e1d36158ba70ac1076ba4da0211d;p=live-boot-grml.git

diff --git a/scripts/live-bottom/24preseed b/scripts/live-bottom/24preseed
index 2536bd0..1f5c513 100755
--- a/scripts/live-bottom/24preseed
+++ b/scripts/live-bottom/24preseed
@@ -26,6 +26,7 @@ then
 fi
 
 . /scripts/live-functions
+load_confmodule
 
 log_begin_msg "Loading preseed file"
 
@@ -33,12 +34,15 @@ log_begin_msg "Loading preseed file"
 
 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,14 +56,20 @@ then
 	done
 fi
 
-reply="$(echo "GET preseed/early_command" | chroot /root debconf-communicate -fnoninteractive live-initramfs)"
-
-if [ "${reply#0 }" != "${reply}" ]
+if db_get preseed/early_command && [ "$RET" ]
 then
-	reply="${reply#0 }"
-	sh -c "${reply}"
+	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