Move arm64 changes into auto/config instead of in build.sh

Signed-off-by: Steev Klimaszewski <steev@kali.org>

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"
     ;;

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