From 447a822f8ee47b63a4cae00423c4d407bfa5e516 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Wed, 15 Dec 2021 13:58:24 +0100 Subject: [PATCH] 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. --- src/kernel-install/kernel-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" -- 2.47.3