summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2009-10-30 15:40:25 +0000
committerOlivier Blin <oblin@mandriva.com>2009-10-30 15:40:25 +0000
commit9ba356f4bf8d3f538fab80ac3246a9ef8f1b2f5c (patch)
tree6fbdc999c3f6182fc6b8fd688c5637159afd0bf2
parent599f2c2f23a946d2608b86b04cf0d0646892d58a (diff)
downloaddrakx-9ba356f4bf8d3f538fab80ac3246a9ef8f1b2f5c.tar
drakx-9ba356f4bf8d3f538fab80ac3246a9ef8f1b2f5c.tar.gz
drakx-9ba356f4bf8d3f538fab80ac3246a9ef8f1b2f5c.tar.bz2
drakx-9ba356f4bf8d3f538fab80ac3246a9ef8f1b2f5c.tar.xz
drakx-9ba356f4bf8d3f538fab80ac3246a9ef8f1b2f5c.zip
make sure we use long name when adding second kernel with same extension than preferred one
-rw-r--r--perl-install/bootloader.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 83a9bada1..23dcbc097 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -899,8 +899,6 @@ sub get_kernel_labels {
@kernels_str = (@$kernel_24, @$other);
}
- $kernels_str[0]{ext} = '';
-
my %labels;
foreach (@kernels_str) {
if ($labels{$_->{ext}}) {
@@ -909,6 +907,9 @@ sub get_kernel_labels {
$labels{$_->{ext}} = 1;
}
}
+
+ $kernels_str[0]{ext} = '';
+
@kernels_str;
}