From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 16 Mar 2023 04:33:28 +0000 (+0900)
Subject: kernel-install: check all entry candidates first, then check existence of $pref/loade... 
X-Git-Tag: v254-rc1~992^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b0e339547fe3e14c61b64d726749d504c39e466c;p=thirdparty%2Fsystemd.git

kernel-install: check all entry candidates first, then check existence of $pref/loader/entries only once

If we have multiple entries in $ENTRY_TOKEN_SEARCH, and $pref/loader/entries
exists, then previously we would always exit after the first candidate and
ignore the second and later candidates.

Follow-up for 1b43f868934e971480249a6e0fa2f45da906ea2e.
---

diff --git a/src/kernel-install/kernel-install.in b/src/kernel-install/kernel-install.in
index bbbd9c8e455..a16c29d2aa5 100755
--- a/src/kernel-install/kernel-install.in
+++ b/src/kernel-install/kernel-install.in
@@ -217,15 +217,15 @@ for pref in $BOOT_ROOT_SEARCH; do
         else
             log_verbose "$pref/$suff not found…"
         fi
-
-        if [ -d "$pref/loader/entries" ]; then
-            [ -z "$BOOT_ROOT" ] && BOOT_ROOT="$pref"
-            log_verbose "$pref/loader/entries exists, using BOOT_ROOT=$BOOT_ROOT"
-            break 2
-        else
-            log_verbose "$pref/loader/entries not found…"
-        fi
     done
+
+    if [ -d "$pref/loader/entries" ]; then
+        [ -z "$BOOT_ROOT" ] && BOOT_ROOT="$pref"
+        log_verbose "$pref/loader/entries exists, using BOOT_ROOT=$BOOT_ROOT"
+        break
+    else
+        log_verbose "$pref/loader/entries not found…"
+    fi
 done
 
 [ -z "$BOOT_ROOT" ] && for pref in "/efi" "/boot/efi"; do