[SCM] live-build branch, debian-next, updated. debian/3.0_a5-1-22-gd646f46

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit d646f4659be1ca98d420c0fc41f068d1059c7512
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Nov 13 15:45:36 2010 +0100

    Making d-i indices copying depending on binary image type.

diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
index 380e3f6..31e95bc 100755
--- a/scripts/build/lb_binary_debian-installer
+++ b/scripts/build/lb_binary_debian-installer
@@ -617,18 +617,29 @@ EOF
 	rm -f chroot/binary.sh
 	mv chroot/root/binary ./
 
-	case "${LB_BINARY_FILESYSTEM}" in
-		fat*)
-			# Creating dist directories
-			for DISTRIBUTION in frozen stable testing unstable ${LB_DISTRIBUTION}
-			do
-				cp -a ${LB_DEBIAN_INSTALLER_DISTRIBUTION} binary/dists/${DISTRIBUTION}
-			done
+	DISTRIBUTIONS="frozen stable testing unstable"
+
+	if [ "${LB_DEBIAN_INSTALLER_DISTRIBUTION}" != "${LB_DISTRIBUTION}" ]
+	then
+		DISTRIBUTIONS="${DISTRIBUTIONS} ${LB_DISTRIBUTION}"
+	fi
+
+	case "${LB_BINARY_IMAGES}" in
+		usb-hdd)
+			case "${LB_BINARY_FILESYSTEM}" in
+				fat*)
+					# Creating dist directories
+					for DISTRIBUTION in ${DISTRIBUTIONS}
+					do
+						cp -a binary/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION} binary/dists/${DISTRIBUTION}
+					done
+					;;
+			esac
 			;;
 
 		*)
 			# Creating dist symlinks
-			for DISTRIBUTION in frozen stable testing unstable ${LB_DISTRIBUTION}
+			for DISTRIBUTION in ${DISTRIBUTIONS}
 			do
 				ln -s ${LB_DEBIAN_INSTALLER_DISTRIBUTION} binary/dists/${DISTRIBUTION}
 			done

-- 
live-build