summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-03-03 18:41:23 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-03-03 18:41:23 +0000
commit6a89fe90c80fb736fb339c4a6abcecbbb12b7a00 (patch)
tree27e2571c9f01f254ba137fd4f86255962e343144
parentd2f17e9156effa063e31eddc239e7b89ac96092b (diff)
downloaddrakx-6a89fe90c80fb736fb339c4a6abcecbbb12b7a00.tar
drakx-6a89fe90c80fb736fb339c4a6abcecbbb12b7a00.tar.gz
drakx-6a89fe90c80fb736fb339c4a6abcecbbb12b7a00.tar.bz2
drakx-6a89fe90c80fb736fb339c4a6abcecbbb12b7a00.tar.xz
drakx-6a89fe90c80fb736fb339c4a6abcecbbb12b7a00.zip
- bootloader-config:
o have a nicer name for "mnb" kernels
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/bootloader.pm2
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 3c9b37ff6..6f3b78f99 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -2,6 +2,8 @@
- drakbug:
o do not catch exception if $^S is undef
(occurs when "eval { require foo }" and foo.pm do "use not_available")
+- bootloader-config:
+ o have a nicer name for "mnb" kernels
Version 10.6.25 - 28 February 2008
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index c762ba07a..1c0136379 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -43,7 +43,7 @@ sub vmlinuz2kernel_str {
{
basename => $basename,
version => $version,
- $version =~ /(.*)-(\D.*)-(\d+md[kv])$/ ? #- eg: 2.6.22.5-server-1mdv
+ $version =~ /(.*)-(\D.*)-(\d+(mdk|mdv|mnb))$/ ? #- 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),