summaryrefslogtreecommitdiff
path: root/functions
diff options
context:
space:
mode:
authorTiago Bortoletto Vaz <tiagovaz@safernet.org.br>2008-08-12 22:11:18 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:03:39 +0100
commitaa6204c8aec159875bf1010ca93eea05a16949b2 (patch)
tree2a6978e7357269d6d83366705be4d76bb1543b89 /functions
parent384a050c792ed13b3c1b0427ce55b7c3b3463170 (diff)
downloadlive-build-aa6204c8aec159875bf1010ca93eea05a16949b2.zip
live-build-aa6204c8aec159875bf1010ca93eea05a16949b2.tar.gz
Also allowing multiple preseeding files for netboot.
Diffstat (limited to 'functions')
-rwxr-xr-xfunctions/defaults.sh10
1 files changed, 7 insertions, 3 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