From 18e35893f7c30ad4866b75951f119f3278e8143f Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Date: Tue, 14 Apr 2020 10:11:35 +0000
Subject: [PATCH] Do not try to use MBR on AArch64

When I tried to build CentOS8 image for AArch64 I got error saying that
MBR is not supported. So make sure that it will not be used by default.

Change-Id: Ib67ab7f808d727c3c61932c540d398dbe723972f
---
 diskimage_builder/lib/common-functions | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/diskimage_builder/lib/common-functions b/diskimage_builder/lib/common-functions
index bafbf7442..c5c314af2 100644
--- a/diskimage_builder/lib/common-functions
+++ b/diskimage_builder/lib/common-functions
@@ -302,7 +302,11 @@ function _arg_defaults_hack() {
     done
 
     if [[ -n "${vm_seen}" && -z "${blockdev_seen}" ]]; then
-        elements="$elements block-device-mbr"
+        if [[ "arm64 aarch64" =~ $ARCH ]] ; then
+            elements="$elements block-device-efi"
+        else
+            elements="$elements block-device-mbr"
+        fi
     fi
 
     echo $elements