From 5a07ff4602b31194b980cbce6a67ad07aad8a47d Mon Sep 17 00:00:00 2001 From: Christopher Glass Date: Tue, 17 Jan 2017 08:10:26 +0000 Subject: [PATCH] Roll both switches on $ARCH into one, as suggested at review. --- .../hooks/041-vmdk-ova-image.binary | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary b/live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary index e2421cb6..3884f321 100755 --- a/live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary +++ b/live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary @@ -9,24 +9,22 @@ # # For this step, we re-use the VMDK's made in 040-vmdk-image.binary -case $ARCH in - amd64|i386) ;; - *) echo "OVA images are not supported for $ARCH yet."; - exit 0;; -esac # Switch on $ARCH to determine which ID and description to use in the produced # OVF. We have fancy Ubuntu-specific IDs in the OVF specification, we might as # well use them. case $ARCH in amd64) - ovf_id=94 - ovf_os_type="ubuntu64Guest" - ovf_desc_bits=64 ;; + ovf_id=94 + ovf_os_type="ubuntu64Guest" + ovf_desc_bits=64 ;; i386) - ovf_id=93 - ovf_os_type="ubuntu32Guest" - ovf_desc_bits=32 ;; + ovf_id=93 + ovf_os_type="ubuntu32Guest" + ovf_desc_bits=32 ;; + *) + echo "OVA images are not supported for $ARCH yet."; + exit 0;; esac cur_d=${PWD}