Adding upstream version 1.236.1.

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

diff --git a/scripts/live-bottom/24preseed b/scripts/live-bottom/24preseed
index a8f5a46..1f5c513 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,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