X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F24preseed;h=85c6494406ffd820838cce08b97e9e32a37aecfe;hb=e66f79476042794195978ee641aa7ea0d9ca6e0a;hp=60b9be6035be6318ab87126932346bf70a0d2c6f;hpb=e1f1b6e7af1c7d602ffc0d2879dc9ff19bd19583;p=live-boot-grml.git diff --git a/scripts/live-bottom/24preseed b/scripts/live-bottom/24preseed index 60b9be6..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,16 +55,12 @@ 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 - echo 'APT::Keep-Fds { "3"; "4"; };' > /root/etc/apt/apt.conf.d/00-early-debconf - DEBIAN_FRONTEND=passthrough \ - DEBCONF_READFD=3 \ - DEBCONF_WRITEFD=4 \ - DEBCONF_DB_REPLACE=configdb \ - DEBCONF_DB_OVERRIDE='Pipe{infd:none outfd:none}' \ - sh -c "$RET" - rm -f /root/etc/apt/apt.conf.d/00-early-debconf + reply="${reply#0 }" + sh -c "${reply}" fi # Clear out debconf database backup files to save memory.