X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F24preseed;h=85c6494406ffd820838cce08b97e9e32a37aecfe;hb=38ff2dffb863b87472111184a12305996fc1e40e;hp=1f5c513067aa4d5615ce3164eb8c1e3d819fdb1b;hpb=35667bd4deb41faa9247fb7321a4d15e7f524cf7;p=live-boot-grml.git

diff --git a/scripts/live-bottom/24preseed b/scripts/live-bottom/24preseed
index 1f5c513..85c6494 100755
--- a/scripts/live-bottom/24preseed
+++ b/scripts/live-bottom/24preseed
@@ -18,7 +18,7 @@ case "${1}" in
 		;;
 esac
 
-# live-initramfs header
+# live-boot header
 
 if [ -n "${NOPRESEED}" ]
 then
@@ -26,22 +26,21 @@ then
 fi
 
 . /scripts/live-functions
-load_confmodule
 
 log_begin_msg "Loading preseed file"
 
-# live-initramfs script
+# live-boot script
 
 if [ -e /preseed.cfg ]
 then
-	live-set-selections /preseed.cfg
+	chroot /root debconf-set-selections < /preseed.cfg
 fi
 
 if [ -n "${LOCATIONS}" ]
 then
 	for item in ${LOCATIONS}
 	do
-		live-set-selections "/root$item"
+		chroot /root debconf-set-selections < "/root${item}"
 	done
 fi
 
@@ -56,20 +55,14 @@ then
 	done
 fi
 
-if db_get preseed/early_command && [ "$RET" ]
+reply="$(echo "GET preseed/early_command" | chroot /root debconf-communicate -fnoninteractive live-boot)"
+
+if [ "${reply#0 }" != "${reply}" ]
 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"
+	reply="${reply#0 }"
+	sh -c "${reply}"
 fi
 
-stop_network
-
 # Clear out debconf database backup files to save memory.
 rm -f /root/var/cache/debconf/*.dat-old