diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-11-09 09:59:18 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-11-09 09:59:18 +0000 |
| commit | 26f669c84cb181dfee62dac3eeec65d5a8aec660 (patch) | |
| tree | c454a687d9a843f7def569e9fbbc9433cbd2d69b /perl-install | |
| parent | 01cc16b6174ef4b9ddc74725304478efeb708b52 (diff) | |
| download | drakx-26f669c84cb181dfee62dac3eeec65d5a8aec660.tar drakx-26f669c84cb181dfee62dac3eeec65d5a8aec660.tar.gz drakx-26f669c84cb181dfee62dac3eeec65d5a8aec660.tar.bz2 drakx-26f669c84cb181dfee62dac3eeec65d5a8aec660.tar.xz drakx-26f669c84cb181dfee62dac3eeec65d5a8aec660.zip | |
- bootloader-config:
o do not create "linux" entries for xen kernels, but "xen" entries instead
(as requested by guillomovitch on #mandrivafr)
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 9aad03ef6..fc1022d1d 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +- bootloader-config: + o do not create "linux" entries for xen kernels, but "xen" entries instead - localedrake: o fix handling variant together with charset (eg: uz.UTF-8@Latn) (#35090) - drakbug: diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 605712975..13959c369 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -84,9 +84,12 @@ sub kernel_str2initrd_short { sub kernel_str2label { my ($kernel, $o_use_long_name) = @_; - my $base = $kernel->{basename} eq 'vmlinuz' ? 'linux' : $kernel->{basename}; - $o_use_long_name || $kernel->{use_long_name} ? - _sanitize_ver($kernel) : $base; + if ($o_use_long_name || $kernel->{use_long_name}) { + _sanitize_ver($kernel); + } else { + $kernel->{basename} eq 'vmlinuz' ? ($kernel->{ext} eq 'xen' ? $kernel->{ext} : 'linux') : + $kernel->{basename}; + } } sub get { |