Fix platform testing for suffix configuration

Grub doesn't seem happy with && tests in if statements, so replace it with
a two stage check.
This commit is contained in:
Matthew Garrett 2016-01-08 14:19:25 -08:00
parent 1f7c749b2d
commit b6792a5609

View File

@ -88,11 +88,13 @@ if [ -z "$linux_console" ]; then
fi
fi
# UEFI uses linuxefi/initrdefi instead of linux/initrd except for arm64
if [ "$grub_platform" = efi ] && [ "$grub_cpu" != arm64 ]; then
set suf="efi"
else
set suf=""
# UEFI uses linuxefi/initrdefi instead of linux/initrd except for arm64
if [ "$grub_platform" = efi ]; then
if [ "$grub_cpu" != arm64 ]; then
set suf="efi"
fi
fi
# Assemble the options applicable to all the kernels below