[SCM] live-build branch, debian-old-2.0, updated. 3fa575103c6549ad7df429e385ce69f228e7ee31

[Daniel Baumann]

The following commit has been merged in the debian-old-2.0 branch:
commit 3fa575103c6549ad7df429e385ce69f228e7ee31
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Mar 21 20:52:04 2011 +0100

    Setting partition flags after creating the filesystem, workaround for bug in parted where we result in having the partition type set to linux otherways, thanks to Cody A.W. Somerville <cody.somerville at canonical.com> for the idea.

diff --git a/scripts/build/lb_binary_usb b/scripts/build/lb_binary_usb
index 5b3c645..51e6ca7 100755
--- a/scripts/build/lb_binary_usb
+++ b/scripts/build/lb_binary_usb
@@ -146,8 +146,6 @@ case "${LB_BUILD_WITH_CHROOT}" in
 	true)
 		Chroot chroot "parted -s ${FREELO} mklabel ${PARTITION_TABLE_TYPE}" || true
 		Chroot chroot "parted -s ${FREELO} mkpart primary ${PARTITION_TYPE} 0.0 100%" || true
-		Chroot chroot "parted -s ${FREELO} set 1 boot on" || true
-		Chroot chroot "parted -s ${FREELO} set 1 lba off" || true
 
 		if [ "${LB_BOOTLOADER}" = "syslinux" ]
 		then
@@ -158,8 +156,6 @@ case "${LB_BUILD_WITH_CHROOT}" in
 	false)
 		parted -s ${FREELO} mklabel ${PARTITION_TABLE_TYPE} || true
 		parted -s ${FREELO} mkpart primary ${PARTITION_TYPE} 0.0 100% || true
-		parted -s ${FREELO} set 1 boot on || true
-		parted -s ${FREELO} set 1 lba off || true
 
 		if [ "${LB_BOOTLOADER}" = "syslinux" ]
 		then
@@ -194,10 +190,16 @@ esac
 case "${LB_BUILD_WITH_CHROOT}" in
 	true)
 		Chroot chroot "mkfs.${MKFS} ${MKFS_OPTIONS} ${FREELO}"
+
+		Chroot chroot "parted -s ${FREELO} set 1 boot on" || true
+		Chroot chroot "parted -s ${FREELO} set 1 lba off" || true
 		;;
 
 	false)
 		mkfs.${MKFS} ${MKFS_OPTIONS} ${FREELO}
+
+		parted -s ${FREELO} set 1 boot on || true
+		parted -s ${FREELO} set 1 lba off || true
 		;;
 esac
 

-- 
live-build