diff options
| -rw-r--r-- | perl-install/NEWS | 5 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 7c3fb263b..9f669c7f2 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,8 @@ +- bootloader-config + o handle new naming of vmlinuz flavors: vmlinuz-<version>-<flavor>-Xmdv + instead of vmlinuz-<version>-Xmdv<flavor> + o always use "linux" short name instead of "linux-<flavor>" + (since the long name is quite nice nowadays) - assume system is a laptop if it contains some "Intel Corporation|Mobile" devices (fix Samsung Q1U detection, #32967) - draksound, harddrake service: diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 12fea67a7..302544acb 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -43,7 +43,10 @@ sub vmlinuz2kernel_str { { basename => $basename, version => $version, - $version =~ /(.*md[kv])-?(.*)/ ? (ext => $2, version_no_ext => $1) : (version_no_ext => $version), + $version =~ /(.*)-(\D.*)-(\d+md[kv])$/ ? #- eg: 2.6.22.5-server-1mdv + (ext => $2, version_no_ext => "$1-$3") : + $version =~ /(.*md[kv])-?(.*)/ ? #- (old) eg: 2.6.17-13mdventerprise + (ext => $2, version_no_ext => $1) : (version_no_ext => $version), }; } @@ -83,8 +86,7 @@ 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($base, $kernel) : - $kernel->{ext} ? "$base-" . short_ext($kernel) : $base; + sanitize_ver($base, $kernel) : $base; } sub get { @@ -857,8 +859,6 @@ sub sanitize_ver { my $v = $kernel_str->{version_no_ext}; if ($v =~ s/-\d+\.mm\././) { $name = join(' ', grep { $_ } $name, 'multimedia'); - } elsif ($v =~ s/-(desktop|server|laptop)-/-/) { - $name = join(' ', grep { $_ } $name, $1); } $v =~ s!md[kv]$!!; |