From 87ab0c95ac712b5858281c27bd6a80e9b094045e Mon Sep 17 00:00:00 2001 From: Steev Klimaszewski Date: Thu, 4 Feb 2021 19:16:23 -0600 Subject: [PATCH] Move arm64 changes into auto/config instead of in build.sh Signed-off-by: Steev Klimaszewski --- auto/config | 4 +++- build.sh | 9 --------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/auto/config b/auto/config index 09fb4ff..3cd20ee 100755 --- a/auto/config +++ b/auto/config @@ -75,12 +75,14 @@ fi # Define options that vary across architectures case "$arch" in - amd64|arm64) + amd64) lb_opts="$lb_opts --debian-installer live" ;; i386) lb_opts="$lb_opts --debian-installer live --linux-flavours 686-pae" ;; + arm64) + lb_opts="$lb_opts --bootloaders grub-efi --uefi-secure-boot disable --win32-loader true" armel|armhf) lb_opts="$lb_opts --binary-images hdd --binary-filesystem ext4 --chroot-filesystem none" ;; diff --git a/build.sh b/build.sh index bb3f6e2..afd43fc 100755 --- a/build.sh +++ b/build.sh @@ -146,10 +146,6 @@ if [ -n "$OPT_pu" ]; then KALI_DIST="$KALI_DIST+pu" fi -if [ "$KALI_ARCH" = "arm64" ]; then - KALI_CONFIG_OPTS="$KALI_CONFIG_OPTS --uefi-secure-boot disable" -fi - # Set sane PATH (cron seems to lack /sbin/ dirs) export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" @@ -213,11 +209,6 @@ 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