Merging casper 1.216.

[live-boot-grml.git] / scripts / live-bottom / 24preseed

diff --git a/scripts/live-bottom/24preseed b/scripts/live-bottom/24preseed
index 3d0bdaf..9a77ef5 100755 (executable)
--- 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,10 +56,9 @@ then
        done
 fi
 
-reply="$(echo "GET preseed/early_command" | chroot /root debconf-communicate -fnoninteractive casper)"
-if [ "${reply#0 }" != "$reply" ]; then
-       reply="${reply#0 }"
-       sh -c "$reply"
+if db_get preseed/early_command && [ "$RET" ]
+then
+       sh -c "$RET"
 fi
 
 # Clear out debconf database backup files to save memory.