diff options
| author | Pascal Terjan <pterjan@mandriva.org> | 2010-01-26 20:02:55 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mandriva.org> | 2010-01-26 20:02:55 +0000 |
| commit | c448f23b16b804f4ba3db0da21efab0451f75f4e (patch) | |
| tree | ab816f4357d246f8afa80d42940969b02131efed | |
| parent | c29c8b0fe1405abfe4c4a9e74a94b5f4e3f312ce (diff) | |
| download | drakx-backup-do-not-use-c448f23b16b804f4ba3db0da21efab0451f75f4e.tar drakx-backup-do-not-use-c448f23b16b804f4ba3db0da21efab0451f75f4e.tar.gz drakx-backup-do-not-use-c448f23b16b804f4ba3db0da21efab0451f75f4e.tar.bz2 drakx-backup-do-not-use-c448f23b16b804f4ba3db0da21efab0451f75f4e.tar.xz drakx-backup-do-not-use-c448f23b16b804f4ba3db0da21efab0451f75f4e.zip | |
fix bootloader entry name for rc kernels
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index da959432c..42a4bc937 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -6,6 +6,8 @@ o fix displaying empty info for USB discs o fix detecting firewire controllers with newer kernels o guess real vendor names for SCSI discs like we do for IDE devices +-booloader: + o fix bootloader entry name for rc kernels Version 13.4 - 7 January 2009 diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 5267981ca..5f75a748c 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+(mdk|mdv|mnb))$/ ? #- eg: 2.6.22.5-server-1mdv + $version =~ /([\d.]*)-(\D.*)-((\d+|0\.rc\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), |