From a545002b7c74e3dbd678550770303670e7fbcc8b Mon Sep 17 00:00:00 2001
From: Steve Langasek <steve.langasek@canonical.com>
Date: Fri, 12 Feb 2016 09:49:17 -0800
Subject: [PATCH] Mark boot partitions as type vfat

---
 live-build/ubuntu-cpc/hooks/032-disk-image.binary | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/live-build/ubuntu-cpc/hooks/032-disk-image.binary b/live-build/ubuntu-cpc/hooks/032-disk-image.binary
index e3dc79dd..045add8b 100755
--- a/live-build/ubuntu-cpc/hooks/032-disk-image.binary
+++ b/live-build/ubuntu-cpc/hooks/032-disk-image.binary
@@ -35,10 +35,11 @@ create_empty_partition() {
     local part="$2"
     local start="$3"
     local end="$4"
-    local bootable="$5"
+    local type="$5"
+    local bootable="$6"
 
     parted_prefix="parted $disk --script --"
-    ${parted_prefix} mkpart primary "$start" "$end"
+    ${parted_prefix} mkpart primary "$type" "$start" "$end"
     if [ -n "$bootable" ]; then
         ${parted_prefix} set "$part" B
     fi
@@ -57,9 +58,9 @@ if [ -n "$BOOTPART_START" ]; then
 	ROOTPART=2
 	ROOTPART_START="$BOOTPART_END"
 	ROOT_BOOTABLE=
-	create_empty_partition "$disk_image" 1 "$BOOTPART_START" "$BOOTPART_END" 1
+	create_empty_partition "$disk_image" 1 "$BOOTPART_START" "$BOOTPART_END" fat32 1
 fi
-create_empty_partition "${disk_image}" "$ROOTPART" "$ROOTPART_START" -1 "$ROOT_BOOTABLE"
+create_empty_partition "${disk_image}" "$ROOTPART" "$ROOTPART_START" -1 ext2 "$ROOT_BOOTABLE"
 
 mount_image "${disk_image}" "$ROOTPART"