[SCM] debian-live branch, master, updated. 1.0_a47-1-36-gbe0f6ae

[Chris Lamb]

The following commit has been merged in the master branch:
commit 802c604984be100df63d4aa7b1847699b76e0b59
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sun Jun 15 16:17:42 2008 +0100

    Refactor partition type handling.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/helpers/lh_binary_usb-hdd b/helpers/lh_binary_usb-hdd
index fb4a9f3..9b8c2c5 100755
--- a/helpers/lh_binary_usb-hdd
+++ b/helpers/lh_binary_usb-hdd
@@ -91,10 +91,21 @@ fi
 echo "!!! The following error/warning messages can be ignored !!!"
 Losetup $FREELO chroot/binary.img 0
 
+case "${LH_BINARY_FILESYSTEM}" in
+	fat16|fat32)
+		PARTITION_TYPE="${LH_BINARY_FILESYSTEM}"
+		;;
+
+	*)
+		Echo_error "Unsupported binary filesystem ${LH_BINARY_FILESYSTEM}"
+		exit 1
+		;;
+esac
+
 case "${LH_CHROOT_BUILD}" in
 	enabled)
 		Chroot "parted -s ${FREELO} mklabel msdos" || true
-		Chroot "parted -s ${FREELO} mkpart primary ${LH_BINARY_FILESYSTEM} 0.0 100%" || true
+		Chroot "parted -s ${FREELO} mkpart primary ${PARTITION_TYPE} 0.0 100%" || true
 		Chroot "parted -s ${FREELO} set 1 boot on" || true
 		Chroot "parted -s ${FREELO} set 1 lba off" || true
 
@@ -106,7 +117,7 @@ case "${LH_CHROOT_BUILD}" in
 
 	disabled)
 		parted -s ${FREELO} mklabel msdos || true
-		parted -s ${FREELO} mkpart primary ${LH_BINARY_FILESYSTEM} 0.0 100% || true
+		parted -s ${FREELO} mkpart primary ${PARTITION_TYPE} 0.0 100%
 		parted -s ${FREELO} set 1 boot on || true
 		parted -s ${FREELO} set 1 lba off || true
 

-- 
debian-live