Attachment 6263 Details for Bug 15692 – just run grub2-install for UEFI

[patch] just run grub2-install for UEFI

15692.diff (text/plain), 816 bytes, created by Thierry Vignaud on 2015-04-13 22:34:52 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Vignaud

Created: 2015-04-13 22:34:52 CEST

Size: 816 bytes

patch

obsolete

diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index ebfc89f..d5bef87 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1810,12 +1810,7 @@ sub write_grub2_install_sh    {
     my ($bootloader, $o_backup_extension) = @_;
     my $f = "$::prefix/boot/grub2/install.sh";
     my $boot = $bootloader->{boot};
-    my @options = $boot =~ /\d$/ || is_uefi() ? ('--grub-setup=/bin/true', $boot) : $boot;
-    if (is_uefi()) {
-	my ($dir) = glob("$::prefix/usr/lib/grub/*-efi");
-	$dir =~ s/$::prefix//;
-	push @options, '--directory', $dir;
-    }
+    my @options = is_uefi() ? () : $boot =~ /\d$/ ? ('--grub-setup=/bin/true', $boot) : $boot;
     renamef($f, $f . ($o_backup_extension || '.old'));
     output_with_perm($f, 0755, join(' ', 'grub2-install', @options));
 }

Actions: View | Diff

Attachments on bug 15692: 6263