From: Jakob Haufe <sur5r@sur5r.net>
Date: Sat, 3 Feb 2024 19:22:21 +0000 (+0100)
Subject: luci-app-attendedsysupgrade: Fix logic error in EFI image selection
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=cb45737d1bf6f89017e2ab557144c524aea2e57e;p=project%2Fluci.git

luci-app-attendedsysupgrade: Fix logic error in EFI image selection

If a non-EFI image comes first in the list of images, it would have
been selected even on an EFI system.

Signed-off-by: Jakob Haufe <sur5r@sur5r.net>
---

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 450af35496..06bc1bb068 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
@@ -85,24 +85,24 @@ return view.extend({
 	},
 
 	selectImage: function (images) {
-		let image;
-		for (image of images) {
-			if (this.firmware.filesystem == image.filesystem) {
+		let firmware = this.firmware;
+		let data = this.data;
+		var filesystemFilter = function(e) {
+			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)
-				if(this.firmware.target.indexOf("x86") != -1) {
-					if (this.data.efi && image.type == 'combined-efi') {
-						return image;
-					} else if (image.type == 'combined') {
-						return image;
-					}
+				if (data.efi) {
+					return (e.type == 'combined-efi');
 				} else {
-					if (image.type == 'sysupgrade' || image.type == 'combined') {
-						return image;
-					}
+					return (e.type == 'combined');
 				}
+			} else {
+				return (e.type == 'sysupgrade' || e.type == 'combined');
 			}
 		}
-		return null;
+		return images.filter(filesystemFilter).filter(typeFilter)[0];
 	},
 
 	handle200: function (response) {