You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
33 lines
1.3 KiB
33 lines
1.3 KiB
2 years ago
|
From 8bcb1df836fccb5ddb6fb071b022bfd490f94e11 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Adam Williamson <awilliam@redhat.com>
|
||
|
|
Date: Wed, 5 Jan 2022 14:07:14 -0800
|
||
|
|
Subject: [PATCH] kernel-install: prefer /boot over /boot/efi for $BOOT_ROOT
|
||
|
|
|
||
|
|
This restores the preference order from before 9e82a74. The code
|
||
|
|
previous to that change 'preferred' /boot over /boot/efi; that
|
||
|
|
commit changed it to check /boot/efi before checking /boot.
|
||
|
|
Changing this precedence could (and did, for me) have unexpected
|
||
|
|
effects - it seems safer to leave it how it was.
|
||
|
|
|
||
|
|
Signed-off-by: Adam Williamson <awilliam@redhat.com>
|
||
|
|
(cherry picked from commit a5307e173bf86d695fe85b8e15e91126e8618a14)
|
||
|
|
|
||
|
|
Related: #2065061
|
||
|
|
---
|
||
|
|
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 097d6557f2..e56483ef96 100755
|
||
|
|
--- a/src/kernel-install/kernel-install
|
||
|
|
+++ b/src/kernel-install/kernel-install
|
||
|
|
@@ -97,7 +97,7 @@ fi
|
||
|
|
[ -z "$MACHINE_ID" ] && MACHINE_ID="Default"
|
||
|
|
|
||
|
|
[ -z "$BOOT_ROOT" ] && for suff in "$MACHINE_ID" "loader/entries"; do
|
||
|
|
- for pref in "/efi" "/boot/efi" "/boot"; do
|
||
|
|
+ for pref in "/efi" "/boot" "/boot/efi" ; do
|
||
|
|
if [ -d "$pref/$suff" ]; then
|
||
|
|
BOOT_ROOT="$pref"
|
||
|
|
break 2
|