From f52b38e59562d98b56316971bdc6ffe0b39484d3 Mon Sep 17 00:00:00 2001
From: Jason Morris <10388115+morris-jason@users.noreply.github.com>
Date: Wed, 9 May 2018 13:12:38 -0500
Subject: [PATCH] Fix installer problems in ci (#1726) (#1832)

Slightly increases the disk size of the ova during the
installer build process. Fixes a syntax error during the
manifest generation and removes target disk loops
during disk export. Fixes #1725.

(cherry picked from commit 7a3d84712ee2b0196c8cccc7669594a3cdf2399f)
---
 installer/build/bootable/build-disks.sh | 7 ++++---
 installer/build/bootable/build-main.sh  | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/installer/build/bootable/build-disks.sh b/installer/build/bootable/build-disks.sh
index c5085b1d67..9448d1bfa4 100755
--- a/installer/build/bootable/build-disks.sh
+++ b/installer/build/bootable/build-disks.sh
@@ -177,8 +177,8 @@ fi
 
 # These sizes are minimal for install, since partitions are resized to full disk space after firstboot.
 IMAGESIZES=(
-  "4GiB"
-  "1GiB"
+  "6GiB"
+  "2GiB"
 )
 IMAGES=(
   "vic-disk1"
@@ -207,7 +207,8 @@ elif [ "${ACTION}" == "export" ]; then
   log1 "export images to VMDKs"
   for i in "${!IMAGES[@]}"; do
     log2 "exporting ${IMAGES[$i]}.img to ${IMAGES[$i]}.vmdk"
-    DEV=$(losetup -l -O NAME,BACK-FILE -a | tail -n +2 | grep "${IMAGES[$i]}" | awk '{print $1}')
+    echo "export ${PACKAGE}/${IMAGES[$i]}"
+    DEV=$(losetup -l -O NAME,BACK-FILE -a | tail -n +2 | grep "${PACKAGE}/${IMAGES[$i]}" | awk '{print $1}')
     convert "${DEV}" "${IMAGEROOTS[$i]}" "${IMAGES[$i]}.img" "${IMAGES[$i]}.vmdk"
   done
 
diff --git a/installer/build/bootable/build-main.sh b/installer/build/bootable/build-main.sh
index 06b6e2ecf8..6a4f29b0ed 100755
--- a/installer/build/bootable/build-main.sh
+++ b/installer/build/bootable/build-main.sh
@@ -137,7 +137,7 @@ function main {
     cd "${PACKAGE}"
     sed -i -e s~--version--~${BUILD_OVA_REVISION}~ vic-${BUILD_OVA_REVISION}.ovf
     log2 "rebuilding OVF manifest"
-    sha256sum --tag "vic-${BUILD_OVA_REVISION}.ovf" "vic-${BUILD_OVA_REVISION}.mf" *.vmdk | sed s/SHA256\ \(/SHA256\(/ > "vic-${BUILD_OVA_REVISION}.mf"
+    sha256sum --tag "vic-${BUILD_OVA_REVISION}.ovf" *.vmdk | sed s/SHA256\ \(/SHA256\(/ > "vic-${BUILD_OVA_REVISION}.mf"
     tar -cvf "${RESOURCE}/vic-${BUILD_OVA_REVISION}.ova" "vic-${BUILD_OVA_REVISION}.ovf" "vic-${BUILD_OVA_REVISION}.mf" *.vmdk
 
     OUTFILE=${RESOURCE}/vic-${BUILD_OVA_REVISION}.ova