diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2024-01-04 17:19:50 +0100 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2024-01-04 21:35:22 +0100 |
| commit | 43dcc53a1d2bc4c8b98d171015d1d8b217f2ab39 (patch) | |
| tree | 682833ea1a80f67f920816dd844cba21d7f0082d | |
| parent | 77cc147f451be2508163eec9fb1447fd75ca898f (diff) | |
| download | drakx-43dcc53a1d2bc4c8b98d171015d1d8b217f2ab39.tar drakx-43dcc53a1d2bc4c8b98d171015d1d8b217f2ab39.tar.gz drakx-43dcc53a1d2bc4c8b98d171015d1d8b217f2ab39.tar.bz2 drakx-43dcc53a1d2bc4c8b98d171015d1d8b217f2ab39.tar.xz drakx-43dcc53a1d2bc4c8b98d171015d1d8b217f2ab39.zip | |
Fix grub2 pkg name on aarch64 (mga#32686)
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/install/any.pm | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 8a05e7ac3..0bd5f99bd 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- Fix grub2-efi package name on aarch64 (mga#32686) + Version 18.66 - 19 August 2023 - Revert change of default DHCP client to dhcpcd (mga#30938) diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm index 47809b240..4ea2ce45d 100644 --- a/perl-install/install/any.pm +++ b/perl-install/install/any.pm @@ -771,13 +771,12 @@ sub rpmsrate_always_flags { } sub default_bootloader() { - my $p; + require bootloader; + my (undef, $p) = bootloader::get_grub2_pkg(); if (is_uefi()) { log::l("defaulting to grub2-efi"); - $p = uefi_type() eq 'ia32' ? 'grub2-efi(x86-32)' : 'grub2-efi(x86-64)'; } else { log::l("defaulting to grub2"); - $p = 'grub2'; } [ $p ]; } |