diff options
| author | Pascal Terjan <pterjan@mandriva.org> | 2010-01-26 20:11:04 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mandriva.org> | 2010-01-26 20:11:04 +0000 |
| commit | 94334b07635aa58d313be9888f4947887a0a9d19 (patch) | |
| tree | 33f1c2e35f4dfc2cf8a48dba1589b7fa2aba6124 | |
| parent | c448f23b16b804f4ba3db0da21efab0451f75f4e (diff) | |
| download | drakx-backup-do-not-use-94334b07635aa58d313be9888f4947887a0a9d19.tar drakx-backup-do-not-use-94334b07635aa58d313be9888f4947887a0a9d19.tar.gz drakx-backup-do-not-use-94334b07635aa58d313be9888f4947887a0a9d19.tar.bz2 drakx-backup-do-not-use-94334b07635aa58d313be9888f4947887a0a9d19.tar.xz drakx-backup-do-not-use-94334b07635aa58d313be9888f4947887a0a9d19.zip | |
remove mnb from bootloader entry name like we do for mdv
| -rw-r--r-- | perl-install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 42a4bc937..3b46d7f1b 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -8,6 +8,7 @@ o guess real vendor names for SCSI discs like we do for IDE devices -booloader: o fix bootloader entry name for rc kernels + o remove mnb from bootloader entry name like we do for mdv Version 13.4 - 7 January 2009 diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 5f75a748c..758d1d6b2 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -942,7 +942,7 @@ sub _sanitize_ver { $name = join(' ', grep { $_ } $name, 'multimedia'); } - $v =~ s!md[kv]$!!; + $v =~ s!(md[kv]|mnb)$!!; $v =~ s!-0\.(pre|rc)(\d+)\.!$1$2-!; my $return = join(' ', grep { $_ } $name, short_ext($kernel_str), $v); |