From 9137a9de3f61e68301660910c53b48cffe4f015d Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Sun, 4 Sep 2022 18:27:29 +0200 Subject: [PATCH] armbian-next: deploy bootscript even if BOOTCONFIG=none - fact we're not BUILDING nor deploying uboot does not mean image does not need a bootscript. --- lib/functions/rootfs/distro-agnostic.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/functions/rootfs/distro-agnostic.sh b/lib/functions/rootfs/distro-agnostic.sh index 67576d9d4f..367e8d4607 100644 --- a/lib/functions/rootfs/distro-agnostic.sh +++ b/lib/functions/rootfs/distro-agnostic.sh @@ -178,7 +178,8 @@ function install_distribution_agnostic() { fi else # ... not extlinux ... - if [[ -n "${BOOTSCRIPT}" && "${BOOTCONFIG}" != "none" ]]; then + if [[ -n "${BOOTSCRIPT}" ]]; then # @TODO: && "${BOOTCONFIG}" != "none" + display_alert "Deploying boot script" "$bootscript_src" "warn" if [ -f "${USERPATCHES_PATH}/bootscripts/${bootscript_src}" ]; then run_host_command_logged cp -pv "${USERPATCHES_PATH}/bootscripts/${bootscript_src}" "${SDCARD}/boot/${bootscript_dst}" else