[SCM] debian-live branch, master, updated. 1.0_a48-1-98-gea96223

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 3c8c019429d5e3c0ffec026cbaebd33bfbae015a
Author: Tiago Bortoletto Vaz <tiagovaz at safernet.org.br>
Date:   Tue Aug 12 22:11:18 2008 +0200

    Also allowing multiple preseeding files for netboot.

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 ..

-- 
debian-live