From e40624bd635a2a96f0e522855c5ab730be7d6841 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Thu, 5 Sep 2013 19:25:39 +0100
Subject: [PATCH] Debian: plumb $want_kernver through in debian_boot_setup

---
 Osstest/Debian.pm | 12 ++++++------
 ts-xen-install    |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index e58a7cc0..574f4b14 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -43,9 +43,9 @@ BEGIN {
 
 #---------- manipulation of Debian bootloader setup ----------
 
-sub debian_boot_setup ($$$;$) {
+sub debian_boot_setup ($$$$;$) {
     # $xenhopt==undef => is actually a guest, do not set up a hypervisor
-    my ($ho, $xenhopt, $distpath, $hooks) = @_;
+    my ($ho, $want_kernver, $xenhopt, $distpath, $hooks) = @_;
 
     target_kernkind_check($ho);
     target_kernkind_console_inittab($ho,$ho,"/");
@@ -70,9 +70,9 @@ sub debian_boot_setup ($$$;$) {
 
     my $bootloader;
     if ($ho->{Suite} =~ m/lenny/) {
-        $bootloader= setupboot_grub1($ho, $xenhopt, $kopt);
+        $bootloader= setupboot_grub1($ho, $want_kernver, $xenhopt, $kopt);
     } else {
-        $bootloader= setupboot_grub2($ho, $xenhopt, $kopt);
+        $bootloader= setupboot_grub2($ho, $want_kernver, $xenhopt, $kopt);
     }
 
     target_cmd_root($ho, "update-grub");
@@ -109,7 +109,7 @@ sub bl_getmenu_open ($$$) {
 }
 
 sub setupboot_grub1 ($$$) {
-    my ($ho,$xenhopt,$xenkopt) = @_;
+    my ($ho,$want_kernver,$xenhopt,$xenkopt) = @_;
     my $bl= { };
 
     my $rmenu= "/boot/grub/menu.lst";
@@ -182,7 +182,7 @@ sub setupboot_grub1 ($$$) {
 }
 
 sub setupboot_grub2 ($$$) {
-    my ($ho,$xenhopt,$xenkopt) = @_;
+    my ($ho,$wantkernver,$xenhopt,$xenkopt) = @_;
     my $bl= { };
 
     my $rmenu= '/boot/grub/grub.cfg';
diff --git a/ts-xen-install b/ts-xen-install
index fadfa53e..bf39f7e8 100755
--- a/ts-xen-install
+++ b/ts-xen-install
@@ -145,6 +145,7 @@ sub setupboot () {
         };
     }
 
+    my $want_kernver = get_runvar('kernel_ver','kernbuildjob');
     debian_boot_setup($ho, $xenhopt, \%distpath, \@hooks);
 
     logm("ready to boot Xen");
-- 
2.39.5