diff options
| author | Tiago Bortoletto Vaz <tiagovaz@safernet.org.br> | 2008-08-12 22:11:18 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:03:39 +0100 |
| commit | aa6204c8aec159875bf1010ca93eea05a16949b2 (patch) | |
| tree | 2a6978e7357269d6d83366705be4d76bb1543b89 | |
| parent | 384a050c792ed13b3c1b0427ce55b7c3b3463170 (diff) | |
| download | live-build-aa6204c8aec159875bf1010ca93eea05a16949b2.zip live-build-aa6204c8aec159875bf1010ca93eea05a16949b2.tar.gz | |
Also allowing multiple preseeding files for netboot.
| -rwxr-xr-x | functions/defaults.sh | 10 | ||||
| -rwxr-xr-x | helpers/lh_binary_debian-installer | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index 7db4e4d..892f1f3 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -539,7 +539,7 @@ Set_defaults () then if Find_files config/binary_debian-installer/preseed.cfg then - LH_DEBIAN_INSTALLER_PRESEEDFILE="/install/preseed.cfg" + LH_DEBIAN_INSTALLER_PRESEEDFILE="/preseed.cfg" fi if Find_files config/binary_debian-installer/*.cfg && [ ! -e config/binary_debian-installer/preseed.cfg ] @@ -557,11 +557,15 @@ Set_defaults () then case "${LH_BINARY_IMAGES}" in iso) - LH_BOOTAPPEND_PRESEED="file=/cdrom${LH_DEBIAN_INSTALLER_PRESEEDFILE}" + LH_BOOTAPPEND_PRESEED="file=/cdrom/install/${LH_DEBIAN_INSTALLER_PRESEEDFILE}" ;; usb-hdd) - LH_BOOTAPPEND_PRESEED="file=/hd-media${LH_DEBIAN_INSTALLER_PRESEEDFILE}" + LH_BOOTAPPEND_PRESEED="file=/hd-media/install/${LH_DEBIAN_INSTALLER_PRESEEDFILE}" + ;; + + net) + LH_BOOTAPPEND_PRESEED="file=/${LH_DEBIAN_INSTALLER_PRESEEDFILE}" ;; esac fi diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer index 35f5263..8a26be2 100755 --- a/helpers/lh_binary_debian-installer +++ b/helpers/lh_binary_debian-installer @@ -651,7 +651,7 @@ Repack_initrd() cd ${REPACK_TMPDIR} gzip -d < ../${TARGET_INITRD} | cpio -i --make-directories --no-absolute-filenames - cp ../config/binary_debian-installer/preseed.cfg . + cp ../config/binary_debian-installer/*.cfg . find | cpio -H newc -o | gzip -9 > ../${TARGET_INITRD} cd .. |