diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-05-01 13:31:18 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:48:09 +0100 |
| commit | c967ebfc4e43fb16a0c2c140c66900712be95ab7 (patch) | |
| tree | 74a8a142d7d6ceadcd9c4cb23ee3819fd8739336 /scripts/live-bottom/24preseed | |
| parent | 65721717c4e37f6cec9e66f2ac355746490338ab (diff) | |
| download | live-boot-c967ebfc4e43fb16a0c2c140c66900712be95ab7.tar.gz live-boot-c967ebfc4e43fb16a0c2c140c66900712be95ab7.zip | |
Merging casper 1.216.
Diffstat (limited to 'scripts/live-bottom/24preseed')
| -rwxr-xr-x | scripts/live-bottom/24preseed | 12 |
1 files changed, 5 insertions, 7 deletions
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. |