summaryrefslogtreecommitdiffstats
path: root/perl-install/bootloader.pm
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2016-10-16 08:06:11 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2016-10-16 11:20:03 +0200
commit91520986d808cf5ee663125c7783760de87df999 (patch)
treebff341bb10f8b63cb779c5f160042e5cbe8b7435 /perl-install/bootloader.pm
parent4d6e37a9a982f3068ff587f05a6a4fa5073c13a1 (diff)
downloaddrakx-91520986d808cf5ee663125c7783760de87df999.tar
drakx-91520986d808cf5ee663125c7783760de87df999.tar.gz
drakx-91520986d808cf5ee663125c7783760de87df999.tar.bz2
drakx-91520986d808cf5ee663125c7783760de87df999.tar.xz
drakx-91520986d808cf5ee663125c7783760de87df999.zip
drop support for very old kernel flavors
those are no more generated for more than 10 years... also make kernel server default if installed
Diffstat (limited to 'perl-install/bootloader.pm')
-rw-r--r--perl-install/bootloader.pm10
1 files changed, 2 insertions, 8 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index a7e740546..3d13dc364 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1082,8 +1082,6 @@ sub short_ext {
my ($kernel_str) = @_;
my $short_ext = {
- 'i586-up-1GB' => 'i586',
- 'i686-up-4GB' => '4GB',
'xen0' => 'xen',
}->{$kernel_str->{ext}};
@@ -1098,7 +1096,7 @@ sub _sanitize_ver {
my $v = $kernel_str->{version_no_ext};
if ($v =~ s/-\d+\.mm\././) {
- $name = join(' ', grep { $_ } $name, 'multimedia');
+ $name = join(' ', grep { $_ } $name);
}
$v =~ s!(md[kv]|mnb)$!!;
@@ -1106,10 +1104,6 @@ sub _sanitize_ver {
my $return = join(' ', grep { $_ } $name, short_ext($kernel_str), $v);
- length($return) < 30 or $return =~ s!secure!sec!;
- length($return) < 30 or $return =~ s!enterprise!ent!;
- length($return) < 30 or $return =~ s!multimedia!mm!;
-
$return;
}
@@ -1229,7 +1223,7 @@ sub suggest {
});
} @windows_boot_parts;
- my @preferred = map { "linux-$_" } 'p3-smp-64GB', 'secure', 'enterprise', 'smp', 'i686-up-4GB';
+ my @preferred = map { "linux-$_" } 'server';
if (my $preferred = find { get_label($_, $bootloader) } @preferred) {
$bootloader->{default} ||= $preferred;
}