From c967ebfc4e43fb16a0c2c140c66900712be95ab7 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 1 May 2010 13:31:18 +0200 Subject: Merging casper 1.216. --- scripts/live-bottom/24preseed | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'scripts/live-bottom/24preseed') diff --git a/scripts/live-bottom/24preseed b/scripts/live-bottom/24preseed index 7dd6394..9a77ef5 100755 --- a/scripts/live-bottom/24preseed +++ b/scripts/live-bottom/24preseed @@ -26,6 +26,7 @@ then fi . /scripts/live-functions +load_confmodule log_begin_msg "Loading preseed file" @@ -33,14 +34,14 @@ log_begin_msg "Loading preseed file" if [ -e /preseed.cfg ] then - chroot /root debconf-set-selections < /preseed.cfg + live-set-selections /preseed.cfg fi if [ -n "${LOCATIONS}" ] then for item in ${LOCATIONS} do - chroot /root debconf-set-selections < "/root${ITEM}" + live-set-selections "/root$item" done fi @@ -55,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. -- cgit v1.2.3