From 1fa825b58e08cfc73510b62e9bcedcd0a859b1e3 Mon Sep 17 00:00:00 2001
From: Ricardo Pardini <ricardo@pardini.net>
Date: Sat, 13 Aug 2022 14:39:47 +0200
Subject: [PATCH] armbian-next: fix for tests of `BOOTSCRIPT` and
 `BOOTCONFIG!=none`

---
 lib/functions/rootfs/distro-agnostic.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/functions/rootfs/distro-agnostic.sh b/lib/functions/rootfs/distro-agnostic.sh
index 39a13758d8..8237a9b504 100644
--- a/lib/functions/rootfs/distro-agnostic.sh
+++ b/lib/functions/rootfs/distro-agnostic.sh
@@ -176,9 +176,9 @@ function install_distribution_agnostic() {
 		else
 			echo "  fdtdir ${bootpart_prefix}dtb/" >> "$SDCARD/boot/extlinux/extlinux.conf"
 		fi
-	else
+	else # ... not extlinux ...
 
-		if [[ -n "${BOOTSCRIPT}" ]]; then # @TODO: this used to check BOOTCONFIG not being 'none'
+		if [[ -n "${BOOTSCRIPT}" && "${BOOTCONFIG}" != "none" ]]; then
 			if [ -f "${USERPATCHES_PATH}/bootscripts/${bootscript_src}" ]; then
 				run_host_command_logged cp -pv "${USERPATCHES_PATH}/bootscripts/${bootscript_src}" "${SDCARD}/boot/${bootscript_dst}"
 			else