diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2015-04-13 22:32:32 +0200 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2015-04-14 22:17:39 +0200 |
| commit | 8c3bec9a1c13fed19839e8a85a97ddadfaf17315 (patch) | |
| tree | d2c6d7be41237c31b58efb7aa708f4aa44c87a36 | |
| parent | 983b2c9a5e7c198908c22edbc1e69d4dec2419d7 (diff) | |
| download | drakx-8c3bec9a1c13fed19839e8a85a97ddadfaf17315.tar drakx-8c3bec9a1c13fed19839e8a85a97ddadfaf17315.tar.gz drakx-8c3bec9a1c13fed19839e8a85a97ddadfaf17315.tar.bz2 drakx-8c3bec9a1c13fed19839e8a85a97ddadfaf17315.tar.xz drakx-8c3bec9a1c13fed19839e8a85a97ddadfaf17315.zip | |
do not pass useless parameters (mga#15692)
... to grub2 under UEFI
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 7 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 3 |
3 files changed, 9 insertions, 4 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 7720471a0..12207c7d0 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- drakboot: + o do not pass useless parameters to grub2 under UEFI (mga#15692) + Version 16.82 - 13 April 2015 - diskdrake: diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index ebfc89fb2..ad0b5544c 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -1810,11 +1810,10 @@ 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; + my @options; if (is_uefi()) { - my ($dir) = glob("$::prefix/usr/lib/grub/*-efi"); - $dir =~ s/$::prefix//; - push @options, '--directory', $dir; + } else { + @options = $boot =~ /\d$/ ? ('--grub-setup=/bin/true', $boot) : $boot; } 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 3b0b787d9..3758cbc4f 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,6 @@ +- drakboot: + o do not pass useless parameters to grub2 under UEFI (mga#15692) + Version 16.83 - 13 April 2015 - enable firmware raids with dmraid/kpartx like we do on |