]> xenbits.xensource.com Git - people/iwj/osstest.git/commitdiff
Merge branch 'wip.for-ijc' of xenbits.xen.org:/home/iwj/ext/osstest
authorIan Campbell <ian.campbell@citrix.com>
Fri, 6 Sep 2013 09:05:52 +0000 (10:05 +0100)
committerIan Campbell <ian.campbell@citrix.com>
Fri, 6 Sep 2013 09:05:52 +0000 (10:05 +0100)
Adds kernel_ver runvar from build jobs.

1  2 
Osstest/Debian.pm
ts-kernel-build
ts-xen-install

index 4c068ca7231e3f611aa1ea0ca486478a578cb0f7,f8ab4ac2f8526d3256022ed08a10180093a9bee1..cacb4ea28b260456bb94c821265273e41a9a86e9
@@@ -71,12 -70,12 +71,12 @@@ 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");
 +    $bootloader->{UpdateConfig}($ho);
  
      my $kern= $bootloader->{GetBootKern}();
      logm("dom0 kernel is $kern");
diff --cc ts-kernel-build
Simple merge
diff --cc ts-xen-install
Simple merge