summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-02-05 13:10:59 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-02-05 13:10:59 +0000
commit9b76a317a8fe974b6528f48cafaf0342a67a9453 (patch)
treec4ce11a7cf7ed8d86f55099ec69a2a7044e0e988
parent782ad76fa5fd6d83ef50f3bd3a9f2ffa7fc68f6d (diff)
downloaddrakx-9b76a317a8fe974b6528f48cafaf0342a67a9453.tar
drakx-9b76a317a8fe974b6528f48cafaf0342a67a9453.tar.gz
drakx-9b76a317a8fe974b6528f48cafaf0342a67a9453.tar.bz2
drakx-9b76a317a8fe974b6528f48cafaf0342a67a9453.tar.xz
drakx-9b76a317a8fe974b6528f48cafaf0342a67a9453.zip
- bootloader-config:
o never use "vmlinuz-desktop" or "initrd-desktop.img", always use "vmlinuz" or "initrd.img" (#35721) (backport from HEAD)
-rw-r--r--perl-install/NEWS4
-rw-r--r--perl-install/bootloader.pm6
2 files changed, 6 insertions, 4 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 7e4290825..f5d5e107d 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,7 @@
+- bootloader-config:
+ o never use "vmlinuz-desktop" or "initrd-desktop.img", always use "vmlinuz"
+ or "initrd.img" (#35721)
+
Version 10.4.239.3 - 05 February 2008, by Thierry Vignaud
- be sure to exit on crash after running drakbug
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 2ca5e061e..fbbd24d4b 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -68,8 +68,7 @@ sub kernel_str2vmlinuz_short {
if ($kernel->{use_long_name}) {
kernel_str2vmlinuz_long($kernel);
} else {
- my $ext = $kernel->{ext} ? "-$kernel->{ext}" : '';
- $kernel->{basename} . $ext;
+ $kernel->{basename};
}
}
sub kernel_str2initrd_short {
@@ -77,8 +76,7 @@ sub kernel_str2initrd_short {
if ($kernel->{use_long_name}) {
kernel_str2initrd_long($kernel);
} else {
- my $ext = $kernel->{ext} ? "-$kernel->{ext}" : '';
- basename2initrd_basename($kernel->{basename}) . $ext . '.img';
+ basename2initrd_basename($kernel->{basename}) . '.img';
}
}