diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-02-05 13:09:46 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-02-05 13:09:46 +0000 |
| commit | ccb9426bb7beed119d800cb90da3f07c46010003 (patch) | |
| tree | 20ba3a9e4214652a60852be6e9f92e272e4f9a1a | |
| parent | 8d3ff70b9264d98fbf84b5b18c1c2bb136cc0d5b (diff) | |
| download | drakx-ccb9426bb7beed119d800cb90da3f07c46010003.tar drakx-ccb9426bb7beed119d800cb90da3f07c46010003.tar.gz drakx-ccb9426bb7beed119d800cb90da3f07c46010003.tar.bz2 drakx-ccb9426bb7beed119d800cb90da3f07c46010003.tar.xz drakx-ccb9426bb7beed119d800cb90da3f07c46010003.zip | |
- bootloader-config:
o never use "vmlinuz-desktop" or "initrd-desktop.img", always use "vmlinuz"
or "initrd.img" (#35721)
this should have been done together with commit r226739 (2007-08-31)
| -rw-r--r-- | perl-install/NEWS | 4 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 453a547a3..d02abb4eb 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.6.11 - 31 January 2008 - drakbug: diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 42c1c7726..0a0cca5bc 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'; } } |