[SCM] live-build branch, debian-next, updated. debian/3.0_a47-1-6-g663400e

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 663400e2d1c6ed3307620ce9a4ce7acef0753e2a
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed May 23 07:17:15 2012 +0200

    Using /boot on live media instead of /isolinux or /syslinux in progress mode.

diff --git a/scripts/build/lb_binary_checksums b/scripts/build/lb_binary_checksums
index c5c8819..59fa56c 100755
--- a/scripts/build/lb_binary_checksums
+++ b/scripts/build/lb_binary_checksums
@@ -55,6 +55,7 @@ do
 	cd binary
 	find . -type f \
 		\! -path './isolinux/isolinux.bin' \
+		\! -path './boot/boot.bin' \
 		\! -path './boot/grub/stage2_eltorito' \
 		\! -path './md5sum.txt' \
 		\! -path './sha1sum.txt' \
diff --git a/scripts/build/lb_binary_iso b/scripts/build/lb_binary_iso
index 1db7463..ce9dbd1 100755
--- a/scripts/build/lb_binary_iso
+++ b/scripts/build/lb_binary_iso
@@ -127,8 +127,17 @@ case "${LB_BOOTLOADER}" in
 
 	syslinux)
 		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
-		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -b isolinux/isolinux.bin -c isolinux/boot.cat"
-		GENISOIMAGE_EXCLUDE="isolinux/isolinux.bin"
+		case "${LB_MODE}" in
+			progress)
+				GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -b boot/boot.bin -c boot/boot.cat"
+				GENISOIMAGE_EXCLUDE="boot/boot.bin"
+				;;
+
+			*)
+				GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -b isolinux/isolinux.bin -c isolinux/boot.cat"
+				GENISOIMAGE_EXCLUDE="isolinux/isolinux.bin"
+				;;
+		esac
 		;;
 
 	yaboot)
diff --git a/scripts/build/lb_binary_syslinux b/scripts/build/lb_binary_syslinux
index 153acf2..233d2b1 100755
--- a/scripts/build/lb_binary_syslinux
+++ b/scripts/build/lb_binary_syslinux
@@ -51,7 +51,16 @@ Check_crossarchitectures
 case "${LB_BINARY_IMAGES}" in
 	iso*)
 		_BOOTLOADER="isolinux"
-		_TARGET="binary/isolinux"
+
+		case "${LB_MODE}" in
+			progress)
+				_TARGET="binary/boot"
+				;;
+
+			*)
+				_TARGET="binary/isolinux"
+				;;
+		esac
 		;;
 
 	net*)
@@ -61,7 +70,16 @@ case "${LB_BINARY_IMAGES}" in
 
 	hdd*|*)
 		_BOOTLOADER="syslinux"
-		_TARGET="binary/syslinux"
+
+		case "${LB_MODE}" in
+			progress)
+				_TARGET="binary/boot"
+				;;
+
+			*)
+				_TARGET="binary/syslinux"
+				;;
+		esac
 		;;
 esac
 
@@ -222,6 +240,18 @@ then
 	${_TARGET}/install.cfg
 fi
 
+case "${LB_MODE}" in
+	progress)
+		if [ -e "${_TARGET}/isolinux.cfg" ]
+		then
+			mv "${_TARGET}/isolinux.cfg" "${_TARGET}/boot.cfg"
+		elif [ -e "${_TARGET}/syslinux.cfg" ]
+		then
+			mv "${_TARGET}/syslinux.cfg" "${_TARGET}/boot.cfg"
+		fi
+		;;
+esac
+
 case "${LB_BUILD_WITH_CHROOT}" in
 	true)
 		# Saving cache

-- 
live-build