diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-05-24 15:27:36 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:52:46 +0100 |
| commit | e66f79476042794195978ee641aa7ea0d9ca6e0a (patch) | |
| tree | 90286f281543c1a6f4ad56e229f5ff95438613da /scripts/live-bottom/24preseed | |
| parent | ad7598cb46a5a6268ca60e5dba156056fb86c09d (diff) | |
| download | live-boot-e66f79476042794195978ee641aa7ea0d9ca6e0a.tar.gz live-boot-e66f79476042794195978ee641aa7ea0d9ca6e0a.zip | |
Adding debian version 2.0~a1-1.
Diffstat (limited to 'scripts/live-bottom/24preseed')
| -rwxr-xr-x | scripts/live-bottom/24preseed | 25 |
1 files changed, 9 insertions, 16 deletions
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 |