From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 15 Dec 2021 12:58:24 +0000 (+0100)
Subject: kernel-install: Remove "Default" from list of suffixes checked
X-Git-Tag: v250-rc3~37^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=447a822f8ee47b63a4cae00423c4d407bfa5e516;p=thirdparty%2Fsystemd.git

kernel-install: Remove "Default" from list of suffixes checked

This was an undocumented change in behavior introduced by
9e82a74cb0f08a288f9db228a0b5bec8a7188cdb. Previously, we only
checked for "Default" if we didn't find a machine ID. Let's make
sure we keep the previous behavior intact.
---

diff --git a/src/kernel-install/kernel-install b/src/kernel-install/kernel-install
index 9999b86ed87..f2d954f2dd4 100755
--- a/src/kernel-install/kernel-install
+++ b/src/kernel-install/kernel-install
@@ -93,7 +93,7 @@ fi
 [ -z "$MACHINE_ID" ] && [ -f /etc/machine-id ] && [ "$(stat -fc %T /etc/machine-id)" != "tmpfs" ] && read -r MACHINE_ID < /etc/machine-id
 [ -z "$MACHINE_ID" ] && MACHINE_ID="Default"
 
-[ -z "$BOOT_ROOT" ] && for suff in "$MACHINE_ID" "Default" "loader/entries"; do
+[ -z "$BOOT_ROOT" ] && for suff in "$MACHINE_ID" "loader/entries"; do
     for pref in "/efi" "/boot/efi" "/boot"; do
         if [ -d "$pref/$suff" ]; then
             BOOT_ROOT="$pref"