summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2011-08-01 10:28:11 +0000
committerThierry Vignaud <tv@mageia.org>2011-08-01 10:28:11 +0000
commitd0b618f98b31b524fe56f11cad8ddbabeb9caa43 (patch)
treec58a3d8ffef1d68a6ec2489601717302454cb64e /perl-install
parent47180518fc0424536e0735f90d04cecccaa87f0d (diff)
downloaddrakx-d0b618f98b31b524fe56f11cad8ddbabeb9caa43.tar
drakx-d0b618f98b31b524fe56f11cad8ddbabeb9caa43.tar.gz
drakx-d0b618f98b31b524fe56f11cad8ddbabeb9caa43.tar.bz2
drakx-d0b618f98b31b524fe56f11cad8ddbabeb9caa43.tar.xz
drakx-d0b618f98b31b524fe56f11cad8ddbabeb9caa43.zip
This fixes the detection of kernel vesion for usage in bootloader entries.
It wasn't entirely correct in mga1, and it got worse since we started adding mgaver to rpmtag. Before installing a kernel-desktop-3.0.0-1.mga2 the entry would end up as: title 2 3.0.0-desktop-1.mga With the fix below it creates the proper entry: title desktop 3.0.0-1.mga2 Signed-off-by: Thomas Backlund <tmb@mageia.org>
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/bootloader.pm2
-rw-r--r--perl-install/install/NEWS2
3 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 520f69841..dae237fe2 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- fix bootloader entries names
+
Version 13.60 - 27 July 2011
- any.pm:
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index e9cd86b7c..f26b70da3 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.*)-((\d+|0\.rc\d+.*)mga)$/ ? #- eg: 2.6.22.5-server-1mdv
+ $version =~ /([\d.]*)-(\D.*)-((\d+|0\.rc\d+.*)\.mga.*)$/ ? #- eg: 3.0.0-1.mga2
(ext => $2, version_no_ext => "$1-$3") :
$version =~ /(.*mga)-?(.*)/ ? #- (old) eg: 2.6.17-13mdventerprise
(ext => $2, version_no_ext => $1) : (version_no_ext => $version),
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index c31637eed..8074dcc2e 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- fix bootloader entries names
+
Version 13.58 - 27 May 2011
- fix default level being 'standard' when /etc/security/msec/security.conf