|
 |
15a2072 |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
15a2072 |
From: Javier Martinez Canillas <javierm@redhat.com>
|
|
|
15a2072 |
Date: Tue, 24 Apr 2018 02:16:38 +0200
|
|
|
15a2072 |
Subject: [PATCH] Only attempt to query dev mounted in /boot/efi as boot dev on
|
|
|
15a2072 |
EFI machines
|
|
|
15a2072 |
|
|
|
15a2072 |
The 10_linux script calls grub2-probe to probe the information for the dev
|
|
|
15a2072 |
mounted in /boot/efi, but this directory may not exist on non-EFI machines
|
|
|
15a2072 |
which leads to the following error when generating the grub2 config file:
|
|
|
15a2072 |
|
|
|
15a2072 |
/usr/sbin/grub2-probe: error: failed to get canonical path of `/boot/efi/'
|
|
|
15a2072 |
|
|
|
15a2072 |
Instead query for the device mounted in /boot and use that as the boot dev
|
|
|
15a2072 |
for non-EFI machines.
|
|
|
15a2072 |
|
|
|
15a2072 |
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
|
|
|
15a2072 |
---
|
|
|
15a2072 |
util/grub.d/10_linux.in | 9 +++++++--
|
|
|
15a2072 |
1 file changed, 7 insertions(+), 2 deletions(-)
|
|
|
15a2072 |
|
|
|
15a2072 |
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
|
|
15a2072 |
index 89cd71d852d..61d0664fb5c 100644
|
|
|
15a2072 |
--- a/util/grub.d/10_linux.in
|
|
|
15a2072 |
+++ b/util/grub.d/10_linux.in
|
|
|
15a2072 |
@@ -133,8 +133,13 @@ linux_entry ()
|
|
|
15a2072 |
fi
|
|
|
15a2072 |
fi
|
|
|
15a2072 |
|
|
|
15a2072 |
- bootefi_device="`${grub_probe} --target=device /boot/efi/`"
|
|
|
15a2072 |
- prepare_grub_to_access_device ${bootefi_device} boot
|
|
|
15a2072 |
+ if [ -d /sys/firmware/efi ]; then
|
|
|
15a2072 |
+ bootefi_device="`${grub_probe} --target=device /boot/efi/`"
|
|
|
15a2072 |
+ prepare_grub_to_access_device ${bootefi_device} boot
|
|
|
15a2072 |
+ else
|
|
|
15a2072 |
+ boot_device="`${grub_probe} --target=device /boot/`"
|
|
|
15a2072 |
+ prepare_grub_to_access_device ${boot_device} boot
|
|
|
15a2072 |
+ fi
|
|
|
15a2072 |
|
|
|
15a2072 |
cat << EOF
|
|
|
15a2072 |
insmod blscfg
|