summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/bootloader.pm7
-rw-r--r--perl-install/install/NEWS1
3 files changed, 8 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 4a9c55dbf..792fe3376 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,6 @@
- drakboot:
o check there's still some place on /boot with grub2 too
+ o generate core.img for UEFI
o fix detecting grub2 on UEFI
o write /boot/grub2/install.sh like for grub instead of drakboot.conf
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));
}
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 036cff435..5408eb6a0 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,6 @@
- bootloader config:
o check there's still some place on /boot with grub2 too
+ o generate core.img for UEFI
o fix detecting grub2 on UEFI
o write /boot/grub2/install.sh like for grub instead of drakboot.conf
- log grub2 config in report.bug like for grub/lilo