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

Daniel Baumann daniel at debian.org
Tue Nov 2 10:42:03 UTC 2010


The following commit has been merged in the debian-next branch:
commit 542bf033b4af1266fbdd34648b7a607825daec80
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Nov 2 11:41:51 2010 +0100

    Workarounding symlink on usb-hdd when including debian-installer and using vfat filesystems.

diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
index b61b136..faef0c2 100755
--- a/scripts/build/lb_binary_debian-installer
+++ b/scripts/build/lb_binary_debian-installer
@@ -617,17 +617,22 @@ EOF
 	rm -f chroot/binary.sh
 	mv chroot/root/binary ./
 
-	# Creating dist symlinks
-	for DISTRIBUTION in frozen stable testing unstable ${LB_DISTRIBUTION}
-	do
-		ln -s ${LB_DEBIAN_INSTALLER_DISTRIBUTION} binary/dists/${DISTRIBUTION}
-	done
-
-	case "${LB_BINARY_IMAGES}" in
-		usb*)
+	case "${LB_BINARY_FILESYSTEM}" in
+		vat*)
+			# Creating dist directories
+			for DISTRIBUTION in frozen stable testing unstable ${LB_DISTRIBUTION}
+			do
+				cp -a ${LB_DEBIAN_INSTALLER_DISTRIBUTION} binary/dists/${DISTRIBUTION}
+			done
 			;;
 
 		*)
+			# Creating dist symlinks
+			for DISTRIBUTION in frozen stable testing unstable ${LB_DISTRIBUTION}
+			do
+				ln -s ${LB_DEBIAN_INSTALLER_DISTRIBUTION} binary/dists/${DISTRIBUTION}
+			done
+
 			ln -s . binary/debian
 			;;
 	esac

-- 
live-build



More information about the debian-live-changes mailing list