From b6792a5609fa97c73afa5e66de34161280f6da95 Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg59@coreos.com>
Date: Fri, 8 Jan 2016 14:19:25 -0800
Subject: [PATCH] Fix platform testing for suffix configuration

Grub doesn't seem happy with && tests in if statements, so replace it with
a two stage check.
---
 build_library/grub.cfg | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/build_library/grub.cfg b/build_library/grub.cfg
index a2df9f8d29..b41cb1beba 100644
--- a/build_library/grub.cfg
+++ b/build_library/grub.cfg
@@ -88,11 +88,13 @@ if [ -z "$linux_console" ]; then
     fi
 fi
 
+set suf=""
+
 # UEFI uses linuxefi/initrdefi instead of linux/initrd except for arm64
-if [ "$grub_platform" = efi ] && [ "$grub_cpu" != arm64 ]; then
+if [ "$grub_platform" = efi ]; then
+  if [ "$grub_cpu" != arm64 ]; then
     set suf="efi"
-else
-    set suf=""
+  fi
 fi
 
 # Assemble the options applicable to all the kernels below