Attachment 8125 Details for Bug 15153 – do not preselect grub2 if refind is configured

[patch] do not preselect grub2 if refind is configured

0002-do-not-preselect-grub2-if-refind-is-configured.patch (text/plain), 1.15 KB, created by Thierry Vignaud on 2016-07-05 10:08:24 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Vignaud

Created: 2016-07-05 10:08:24 CEST

Size: 1.15 KB

patch

obsolete

>From 4dd4e20459e249645cf626254ad8c0e78214fdc9 Mon Sep 17 00:00:00 2001
>From: Thierry Vignaud <thierry.vignaud@gmail.com>
>Date: Tue, 14 Apr 2015 05:59:08 -0400
>Subject: [PATCH 2/2] do not preselect grub2 if refind is configured
>
>---
> perl-install/install/any.pm | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
>diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
>index 7cce714..4923f1b 100644
>--- a/perl-install/install/any.pm
>+++ b/perl-install/install/any.pm
>@@ -798,8 +798,14 @@ sub default_bootloader() {
>     my $p;
>     # we only support grub2-efi on UEFI:
>     if (is_uefi()) {
>-       log::l("selecting grub2-efi because it's needed for UEFI boot");
>-       $p = 'grub2-efi';
>+       if (-e "/mnt/boot/EFI/EFI/refind") {
>+         log::l("selecting refind because it's needed for UEFI boot");
>+         $p = 'refind';
>+       } else {
>+         log::l("selecting grub2-efi because it's needed for UEFI boot");
>+         $p = 'grub2-efi';
>+       }
>+    add_n_log("needed for UEFI boot", 'grub2-efi') if is_uefi() && !-e "/mnt/boot/EFI/EFI/refind";
>     } else {
>        log::l("defaulting to grub");
>        $p = 'grub2';
>-- 
>2.9.0
>

From 4dd4e20459e249645cf626254ad8c0e78214fdc9 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Tue, 14 Apr 2015 05:59:08 -0400
Subject: [PATCH 2/2] do not preselect grub2 if refind is configured

---
 perl-install/install/any.pm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index 7cce714..4923f1b 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -798,8 +798,14 @@ sub default_bootloader() {
     my $p;
     # we only support grub2-efi on UEFI:
     if (is_uefi()) {
-       log::l("selecting grub2-efi because it's needed for UEFI boot");
-       $p = 'grub2-efi';
+       if (-e "/mnt/boot/EFI/EFI/refind") {
+         log::l("selecting refind because it's needed for UEFI boot");
+         $p = 'refind';
+       } else {
+         log::l("selecting grub2-efi because it's needed for UEFI boot");
+         $p = 'grub2-efi';
+       }
+    add_n_log("needed for UEFI boot", 'grub2-efi') if is_uefi() && !-e "/mnt/boot/EFI/EFI/refind";
     } else {
        log::l("defaulting to grub");
        $p = 'grub2';
-- 
2.9.0

Actions: View | Diff

Attachments on bug 15153: 5844 | 5845 | 5932 | 5933 | 5936 | 5975 | 6187 | 6188 | 6308 | 8124 | 8125 | 8126 | 8127 | 8128 | 10371