From 26f669c84cb181dfee62dac3eeec65d5a8aec660 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 9 Nov 2007 09:59:18 +0000
Subject: - bootloader-config:   o do not create "linux" entries for xen
 kernels, but "xen" entries instead

(as requested by guillomovitch on #mandrivafr)
---
 perl-install/NEWS          | 2 ++
 perl-install/bootloader.pm | 9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 9aad03ef6..fc1022d1d 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- bootloader-config:
+  o do not create "linux" entries for xen kernels, but "xen" entries instead
 - localedrake:
   o fix handling variant together with charset (eg: uz.UTF-8@Latn) (#35090)
 - drakbug:
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 605712975..13959c369 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -84,9 +84,12 @@ sub kernel_str2initrd_short {
 
 sub kernel_str2label {
     my ($kernel, $o_use_long_name) = @_;
-    my $base = $kernel->{basename} eq 'vmlinuz' ? 'linux' : $kernel->{basename};
-    $o_use_long_name || $kernel->{use_long_name} ?
-      _sanitize_ver($kernel) : $base;
+    if ($o_use_long_name || $kernel->{use_long_name}) {
+	_sanitize_ver($kernel);
+    } else {
+	$kernel->{basename} eq 'vmlinuz' ? ($kernel->{ext} eq 'xen' ? $kernel->{ext} : 'linux') : 
+	  $kernel->{basename};
+    }
 }
 
 sub get {
-- 
cgit v1.2.1