[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 d522b02fc1ce52670d28cfa84f07cef7b745859a
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sun Jun 15 16:20:55 2008 +0100

    Refactor partition table 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 9b8c2c5..4b2ba81 100755
--- a/helpers/lh_binary_usb-hdd
+++ b/helpers/lh_binary_usb-hdd
@@ -91,6 +91,12 @@ fi
 echo "!!! The following error/warning messages can be ignored !!!"
 Losetup $FREELO chroot/binary.img 0
 
+case "${LH_ARCHITECTURE}" in
+	*)
+		PARTITION_TABLE_TYPE="msdos"
+		;;
+esac
+
 case "${LH_BINARY_FILESYSTEM}" in
 	fat16|fat32)
 		PARTITION_TYPE="${LH_BINARY_FILESYSTEM}"
@@ -104,7 +110,7 @@ esac
 
 case "${LH_CHROOT_BUILD}" in
 	enabled)
-		Chroot "parted -s ${FREELO} mklabel msdos" || true
+		Chroot "parted -s ${FREELO} mklabel ${PARTITION_TABLE_TYPE}" || 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
@@ -116,7 +122,7 @@ case "${LH_CHROOT_BUILD}" in
 		;;
 
 	disabled)
-		parted -s ${FREELO} mklabel msdos || true
+		parted -s ${FREELO} mklabel ${PARTITION_TABLE_TYPE} || 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