From a40cfd61809fc8019fdd8e2caa830afe4b0dbfc2 Mon Sep 17 00:00:00 2001
From: Ben Howard <ben.howard@canonical.com>
Date: Thu, 12 Nov 2015 14:45:07 -0700
Subject: [PATCH] ubuntu-cpc: Move apt-get to the top of uefi disk creation

---
 live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary
index ccc6cca9..e0e90c18 100755
--- a/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary
+++ b/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary
@@ -12,9 +12,10 @@ esac
 
 . /build/config/functions
 
+apt-get -qqy install dosfstools gdisk
+
 create_partitions() {
     disk_image="$1"
-    apt-get install -qqy gdisk
     sgdisk "${disk_image}" --zap-all
     case $architecture in
         arm64)
@@ -39,7 +40,6 @@ create_partitions() {
 
 create_and_mount_uefi_partition() {
     uefi_dev="/dev/mapper${loop_device///dev/}p15"
-    apt-get -qqy install dosfstools
     mountpoint="$1"
     mkfs.vfat -F 32 -n UEFI "${uefi_dev}"