summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.org>2009-10-13 22:12:27 +0000
committerPascal Terjan <pterjan@mandriva.org>2009-10-13 22:12:27 +0000
commit668b0ccf0fb538484b0ffd6c40e2582c64d065bc (patch)
tree92320594fd2282886db48d7638248cb482d9a07a
parent56f6f9d3fc3a7d73cda942c7c2c9f6b2a360206a (diff)
downloaddrakx-668b0ccf0fb538484b0ffd6c40e2582c64d065bc.tar
drakx-668b0ccf0fb538484b0ffd6c40e2582c64d065bc.tar.gz
drakx-668b0ccf0fb538484b0ffd6c40e2582c64d065bc.tar.bz2
drakx-668b0ccf0fb538484b0ffd6c40e2582c64d065bc.tar.xz
drakx-668b0ccf0fb538484b0ffd6c40e2582c64d065bc.zip
use initrd-2.6.30.2-xen-5mdv.img instead of initrd-xen-2.6.30.2-xen-5mdv.img
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/bootloader.pm4
2 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index b5ec4d1dd..8814ac737 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -3,6 +3,8 @@
o reduce drawings height
o fix windows resize width
- use UTF-8 for zh_TW (#53976)
+- bootloader:
+ o use initrd-2.6.30.2-xen-5mdv.img instead of initrd-xen-2.6.30.2-xen-5mdv.img
Version 12.64 - 12 October 2009
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 79bfb545a..c07fa6dc2 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -52,7 +52,7 @@ sub vmlinuz2kernel_str {
sub kernel_str2short_name {
my ($kernel) = @_;
- $kernel->{ext} =~ /^xen/ ? 'xen' : $kernel->{basename};
+ $kernel->{basename};
}
sub basename2initrd_basename {
@@ -91,7 +91,7 @@ sub kernel_str2label {
_sanitize_ver($kernel);
} else {
my $short_name = kernel_str2short_name($kernel);
- $short_name eq 'vmlinuz' ? 'linux' : $short_name;
+ $kernel->{ext} =~ /^xen/ ? 'xen' : ($short_name eq 'vmlinuz' ? 'linux' : $short_name);
}
}