From aa6204c8aec159875bf1010ca93eea05a16949b2 Mon Sep 17 00:00:00 2001
From: Tiago Bortoletto Vaz <tiagovaz@safernet.org.br>
Date: Tue, 12 Aug 2008 22:11:18 +0200
Subject: Also allowing multiple preseeding files for netboot.
---
functions/defaults.sh | 10 +++++++---
helpers/lh_binary_debian-installer | 2 +-
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 7db4e4d0c..892f1f3e2 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 35f526326..8a26be26f 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 ..
--
cgit v1.2.3