Attachment 1431358 Details for Bug 1574992 – A patch

[patch] A patch

os-prober-uefi.patch (text/plain), 1.37 KB, created by H.J. Lu on 2018-05-04 13:41:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: H.J. Lu

Created: 2018-05-04 13:41:21 UTC

Size: 1.37 KB

patch

obsolete

>From 39dae21c5e022067d5a5c6f8d2cdc70aaf84cd3a Mon Sep 17 00:00:00 2001
>From: rpm-build <rpm-build>
>Date: Fri, 4 May 2018 06:34:13 -0700
>Subject: [PATCH] Also check /boot/efi/EFI/fedora/grub.cfg
>
>Since Fedora installs grub.cfg under /boot/efi/EFI/fedora on machines
>with UEFI, we also need to check /boot/efi/EFI/fedora/grub.cfg.
>
>FIXME: Need to check grub.cfg from other Linux distros.
>---
> linux-boot-probes/mounted/common/40grub2 | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
>diff --git a/linux-boot-probes/mounted/common/40grub2 b/linux-boot-probes/mounted/common/40grub2
>index e0e9b0f..7284c46 100755
>--- a/linux-boot-probes/mounted/common/40grub2
>+++ b/linux-boot-probes/mounted/common/40grub2
>@@ -111,9 +111,13 @@ if [ -e "$mpoint/boot/grub/grub.cfg" ] && \
>     [ "$mpoint/boot/grub/grub.cfg" -nt "$mpoint/boot/grub/menu.lst" ]); then
> 	debug "parsing grub.cfg"
> 	parse_grub_menu "$mpoint" "$partition" "$bootpart" < "$mpoint/boot/grub/grub.cfg"
>-elif [ -e "$mpoint/boot/grub2/grub.cfg" ]; then
>-	debug "parsing grub.cfg"
>-	parse_grub_menu "$mpoint" "$partition" "$bootpart" < "$mpoint/boot/grub2/grub.cfg"
>+else
>+	for cfg in grub2/grub.cfg efi/EFI/fedora/grub.cfg; do
>+		if [ -e "$mpoint/boot/$cfg" ]; then
>+			debug "parsing $cfg"
>+			parse_grub_menu "$mpoint" "$partition" "$bootpart" < "$mpoint/boot/$cfg"
>+		fi
>+	done
> fi
> 
> if [ "$found_item" = 0 ]; then
>-- 
>2.14.3
>

Actions: View | Diff

Attachments on bug 1574992: 1431358