From d05d7d5db81a8cce3d10ea084f0f860a82526991 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Wed, 8 Apr 2015 07:19:03 -0400
Subject: generate core.img for UEFI

---
 perl-install/bootloader.pm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'perl-install/bootloader.pm')

diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index a64b5dc59..dad8719be 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1810,7 +1810,12 @@ 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$/ ? ('--grub-setup=/bin/true', $boot) : $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;
+    }
     renamef($f, $f . ($o_backup_extension || '.old'));
     output_with_perm($f, 0755, join(' ', 'grub2-install', @options));
 }
-- 
cgit v1.2.1