diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-03-16 13:33:28 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-03-17 20:41:17 +0900 |
| commit | b0e339547fe3e14c61b64d726749d504c39e466c (patch) | |
| tree | a3790c70a3ec2c70fd459dfa323252957f29bf3e /src/kernel-install | |
| parent | 561d8013708bd65d0963e3890c7c55cf7c8830d0 (diff) | |
| download | systemd-b0e339547fe3e14c61b64d726749d504c39e466c.tar.gz | |
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.
Diffstat (limited to 'src/kernel-install')
| -rwxr-xr-x | src/kernel-install/kernel-install.in | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/kernel-install/kernel-install.in b/src/kernel-install/kernel-install.in index bbbd9c8e45..a16c29d2aa 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 |