diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2016-10-16 08:06:11 +0200 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2016-10-16 11:20:03 +0200 |
| commit | 91520986d808cf5ee663125c7783760de87df999 (patch) | |
| tree | bff341bb10f8b63cb779c5f160042e5cbe8b7435 | |
| parent | 4d6e37a9a982f3068ff587f05a6a4fa5073c13a1 (diff) | |
| download | drakx-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
| -rw-r--r-- | perl-install/NEWS | 4 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 10 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 4 |
3 files changed, 10 insertions, 8 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index b7d9689cf..6b5ca7f63 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,7 @@ +- drakboot: + o make kernel server default if installed + (we were only checking for long dead flavors such as enterprise, ...) + Version 17.56 - 19 September 2016 - detect ovirt too (mga#19308) 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; } diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index dee404b57..885328356 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,7 @@ +- bootloader configuration: + o make kernel server default if installed + (we were only checking for long dead flavors such as enterprise, ...) + Version 17.57 - 21 September 2016 - use new CSS syntax for font (mga#19430) |