[SCM] live-build branch, debian-next, updated. debian/3.0_a3-1-8-g977fe45

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 977fe45cfbdfc33ca96e2aa8ec4c0c626cbceac2
Author: intrigeri <intrigeri at boum.org>
Date:   Thu Sep 30 17:30:23 2010 +0200

    Fixing squashfs.sort location with --build-with-chroot false.

diff --git a/scripts/build/lb_binary_rootfs b/scripts/build/lb_binary_rootfs
index 483fdfb..173c5cc 100755
--- a/scripts/build/lb_binary_rootfs
+++ b/scripts/build/lb_binary_rootfs
@@ -307,7 +307,16 @@ case "${LB_CHROOT_FILESYSTEM}" in
 		if [ -f config/binary_rootfs/squashfs.sort ]
 		then
 			MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -sort squashfs.sort"
-			cp config/binary_rootfs/squashfs.sort chroot #FIXME
+
+			case "${LB_BUILD_WITH_CHROOT}" in
+				true)
+					cp config/binary_rootfs/squashfs.sort chroot
+					;;
+
+				false)
+					cp config/binary_rootfs/squashfs.sort .
+					;;
+			esac
 		fi
 
 		case "${LB_BUILD_WITH_CHROOT}" in

-- 
live-build