From 17b40f8aa6c759a71240d795bfe6a05bf18c5c92 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 5 Jun 2007 08:57:50 +0000
Subject: - bootloader-config:   o handle kernel-xen-uptodate (#31154)

---
 perl-install/NEWS          | 3 +++
 perl-install/bootloader.pm | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 2a226165f..ed0071531 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- bootloader-config:
+  o handle kernel-xen-uptodate (#31154)
+
 Version 10.4.132 -  05 June 2007, by Thierry Vignaud
 
 - fix some UTF8 issue (#31067) (notably drakbug)
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 7c3eab5ad..44c75d3a1 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -604,7 +604,9 @@ sub build_mbootpack {
 sub add_kernel {
     my ($bootloader, $kernel_str, $v, $b_nolink, $b_no_initrd) = @_;
 
-    if (short_ext($kernel_str) eq 'xen' && -f '/boot/xen.gz') {
+    #- eg: for /boot/vmlinuz-2.6.17-13mdvxen0 (pkg kernel-xen0-xxx) 
+    #-      or /boot/vmlinuz-2.6.18-xen (pkg kernel-xen-uptodate)
+    if ($kernel_str->{version} =~ /xen/ && -f '/boot/xen.gz') {
 	$v->{xen} = '/boot/xen.gz';
     }
 
-- 
cgit v1.2.1