From 69b9412be6ad7f1d8b5ddf83b21b058ffe822fde Mon Sep 17 00:00:00 2001 From: Steev Klimaszewski Date: Wed, 27 Jan 2021 23:03:06 -0600 Subject: [PATCH] ARM64 fixes for UEFI and bootloader setting. Export the bootloader so we don't attempt to install syslinux/patch isolinux which fails on arm64. Also pass disable to uefi-secure-boot as we don't currently support it. Signed-off-by: Steev Klimaszewski --- build.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 8ebba91..350eb23 100755 --- a/build.sh +++ b/build.sh @@ -145,7 +145,8 @@ if [ -n "$OPT_pu" ]; then KALI_CONFIG_OPTS="$KALI_CONFIG_OPTS --proposed-updates" KALI_DIST="$KALI_DIST+pu" fi -if [ "$ARCHES" = "arm64" ]; then + +if [ "$KALI_ARCH" = "arm64" ]; then KALI_CONFIG_OPTS="$KALI_CONFIG_OPTS --uefi-secure-boot disable" fi @@ -212,6 +213,11 @@ BUILD_LOG=$(pwd)/build.log case "$IMAGE_TYPE" in live) + # Export the bootloader for arm64, otherwise live-build + # attempts to use both isolinux and grub and we only support grub. + if [ "$KALI_ARCH" = "arm64" ]; then + export LB_BOOTLOADERS=grub-efi + fi if [ "$NO_CLEAN" = "" ]; then run_and_log $SUDO lb clean --purge fi