Merge lp:~daniel-thewatkins/livecd-rootfs/i386_ovas into lp:livecd-rootfs

[Dan Watkins]

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-01-13 10:30:44 +0000
+++ debian/changelog	2016-01-13 11:47:32 +0000
@@ -1,3 +1,9 @@
+livecd-rootfs (2.370) UNRELEASED; urgency=medium
+
+  * Produce OVA files for i386 cloud builds.
+
+ -- Daniel Watkins <[e-mail]>  Wed, 13 Jan 2016 11:43:54 +0000
+
 livecd-rootfs (2.369) xenial; urgency=medium
 
   [ Łukasz 'sil2100' Zemczak ]

=== modified file 'live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary'
--- live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary	2015-11-13 15:09:26 +0000
+++ live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary	2016-01-13 11:47:32 +0000
@@ -9,20 +9,23 @@
 #
 # For this step, we re-use the VMDK's made in 040-vmdk-image.binary
 
+architecture=$(chroot chroot dpkg --print-architecture)
+
+case ${architecture} in
+        amd64|i386) ;;
+                 *) echo "OVA images are not supported for ${architecture} yet.";
+                     exit 0;;
+esac
 cur_d=${PWD}
 my_d=$(dirname $(readlink -f ${0}))
 
-architecture=$(chroot chroot dpkg --print-architecture)
-
 base_vmdk="livecd.ubuntu-cpc.disk1.vmdk"
-case ${architecture} in
-        amd64) base_vmdk="livecd.ubuntu-cpc.uefi.vmdk";;
-            *) echo "OVA images are not supported for ${architecture} yet.";
-               exit 0;;
-esac
+if [ $architecture = "amd64" ]; then
+    base_vmdk="livecd.ubuntu-cpc.uefi.vmdk"
+fi
 
 if [ ! -e ${base_vmdk} ]; then
-	find . | grep vmdk
+    find . | grep vmdk
     exit 0
 fi