From a0f6071ac708754fadd7bc984798bddf656095ba Mon Sep 17 00:00:00 2001 From: Thomas Backlund Date: Fri, 8 May 2020 14:44:37 +0300 Subject: - bootloader: fix typo x86 -> x64 for matching 64bit grub2-efi(x86-64) (martinw) (bug introduced in commit: e540363478de809a2a9769c5794b3adab60b63eb) --- perl-install/NEWS | 3 +++ perl-install/bootloader.pm | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'perl-install') diff --git a/perl-install/NEWS b/perl-install/NEWS index e43636cef..ee6950ba0 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- bootloader: + fix typo x86 -> x64 for matching 64bit grub2-efi(x86-64) + Version 18.27 - 1 May 2020 - diskdrake: diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 4eedc6f04..b77e1432b 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -2504,8 +2504,8 @@ sub ensure_pkg_is_installed { if ($main_method eq 'grub2') { my ($prefix, $pkg); if (is_uefi()) { - my %convert = (ia32 => 'i386', aa64 => 'arm64', x86 => 'x86_64'); - my %pkgs = (ia32 => 'x86-32', aa64 => 'aarch-64', x86 => 'x86-64'); + my %convert = (ia32 => 'i386', aa64 => 'arm64', x64 => 'x86_64'); + my %pkgs = (ia32 => 'x86-32', aa64 => 'aarch-64', x64 => 'x86-64'); $prefix = $convert{uefi_type()} . "-efi"; $pkg = "grub2-efi(" . $pkgs{uefi_type()} . ")"; } else { -- cgit v1.2.1