summaryrefslogtreecommitdiffstats
path: root/perl-install/install
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2019-05-25 08:34:07 +0100
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2019-05-27 11:52:14 +0100
commit616a80fa6cf2c2513c0181be3a5b90a84e4ea71f (patch)
treec14b3efbe24119cf99ec9ec9f54bf0f999938522 /perl-install/install
parent2c1a2c4da99760cb7bd96f6d973ca9e904edb445 (diff)
downloaddrakx-616a80fa6cf2c2513c0181be3a5b90a84e4ea71f.tar
drakx-616a80fa6cf2c2513c0181be3a5b90a84e4ea71f.tar.gz
drakx-616a80fa6cf2c2513c0181be3a5b90a84e4ea71f.tar.bz2
drakx-616a80fa6cf2c2513c0181be3a5b90a84e4ea71f.tar.xz
drakx-616a80fa6cf2c2513c0181be3a5b90a84e4ea71f.zip
installer: preselect Core 32bit media on 32-bit EFI platforms.
This allows the 32-bit grub2-efi package to be installed.
Diffstat (limited to 'perl-install/install')
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/install/any.pm14
2 files changed, 15 insertions, 0 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 1ba771130..8542736cc 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,4 @@
+- preselect Core 32bit media on 32-bit EFI platforms
- include all of /usr/lib/udev/hwdb.d (mga#20327)
Version 18.18 - 20 May 2019
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index 7952855cb..36e4da577 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -448,6 +448,19 @@ sub enable_nonfree_media {
$medium->{temp_enabled} = 1;
}
+=item enable_core_32bit_media($medium)
+
+Enable a disabled Core 32bit medium.
+
+=cut
+
+sub enable_core_32bit_media {
+ my ($medium) = @_;
+ return if $medium->{name} !~ /Core/ || $medium->{name} !~ /32bit/ || !$medium->{ignore};
+ log::l("preselecting $medium->{name}");
+ $medium->{temp_enabled} = 1;
+}
+
=item media_screen($o)
Lists available media with their status (enabled/disabled).
@@ -493,6 +506,7 @@ sub media_screen {
my $parent = $distribconf->getvalue($distribconf->getvalue($medium_path, 'updates_for'), 'name');
my $non_regular_medium = intersection(\@media_types, [ qw(backports debug source testing) ]);
enable_nonfree_media($medium) if $nonfree_is_needed && !$non_regular_medium;
+ enable_core_32bit_media($medium) if arch() eq 'x86_64' && uefi_type() eq 'ia32' && !$non_regular_medium;
$non_regular_medium ? () :
+{
val => \$medium->{temp_enabled}, type => 'bool', text => $name,