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

diff --git a/scripts/live-bottom/24preseed b/scripts/live-bottom/24preseed
index a8f5a46..9a77ef5 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,12 +56,9 @@ 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}"
+	sh -c "$RET"
 fi
 
 # Clear out debconf database backup files to save memory.