From: Eric Fahlgren <redacted>
Date: Sun, 17 Nov 2024 16:33:56 +0000 (-0800)
Subject: luci-app-attendedsysupgrade: make image selection consistent across all EFI targets
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=391e115c559e2399a57743aaecc60a09193ecda0;p=openwrt-luci.git

luci-app-attendedsysupgrade: make image selection consistent across all EFI targets

Image selection for armsr and loongarch is currently broken, as
they are not recognized as a "combined" image target.  Add a list
of the appropriate targets to make maintenance easy.

Signed-off-by: Eric Fahlgren <redacted>
---

diff --git a/applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js b/applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js
index 08856611d8..83161215da 100644
--- a/applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js
+++ b/applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js
@@ -83,8 +83,9 @@ return view.extend({
 			return (e.filesystem == firmware.filesystem);
 		}
 		var typeFilter = function(e) {
-			if (firmware.target.indexOf("x86") != -1) {
-				// x86 images can be combined-efi (EFI) or combined (BIOS)
+			let efi_targets = ['armsr', 'loongarch', 'x86'];
+			let efi_capable = efi_targets.some((tgt) => firmware.target.startsWith(tgt));
+			if (efi_capable) {
 				if (data.efi) {
 					return (e.type == 'combined-efi');
 				} else {