From 467d6239daa352483ec8fef003bd4fc723702b77 Mon Sep 17 00:00:00 2001
From: Ian Jackson <iwj@woking.uk.xensource.com>
Date: Fri, 25 Mar 2011 17:20:15 +0000
Subject: [PATCH] pygrub: guest kernel install: move
 target_extract_jobdist_path into Osstest

---
 Osstest.pm     | 10 ++++++++++
 ts-xen-install | 13 ++-----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Osstest.pm b/Osstest.pm
index aed651e..53d9d6f 100644
--- a/Osstest.pm
+++ b/Osstest.pm
@@ -81,6 +81,7 @@ BEGIN {
 		      target_putfilecontents_root_stash
                       target_editfile_root target_file_exists
                       target_install_packages target_install_packages_norec
+                      target_extract_jobdistpath
                       host_reboot host_pxedir target_reboot target_reboot_hard
                       target_choose_vg target_umount_lv target_await_down
                       target_ping_check_down target_ping_check_up
@@ -2368,6 +2369,15 @@ END
     return $console;
 }
 
+sub target_extract_jobdistpath ($$$$$) {
+    my ($ho, $part, $path, $job, $distpath) = @_;
+    $distpath->{$part}= get_stashed($path, $job);
+    my $local= $path;  $local =~ s/path_//;
+    my $distcopy= "/root/extract_$local.tar.gz";
+    target_putfile_root($ho, 300, $distpath->{$part}, $distcopy);
+    target_cmd_root($ho, "cd / && tar zxf $distcopy", 300);
+}
+
 sub guest_find_domid ($$) {
     my ($ho,$gho) = @_;
     return if defined $gho->{Domid};
diff --git a/ts-xen-install b/ts-xen-install
index 2b6e6db..9bb3d3e 100755
--- a/ts-xen-install
+++ b/ts-xen-install
@@ -40,19 +40,10 @@ sub packages () {
     }
 }
 
-sub extract_one ($$$) {
-    my ($part, $path, $job) = @_;
-    $distpath{$part}= get_stashed($path, $job);
-    return if $checkmode;
-    my $local= $path;  $local =~ s/path_//;
-    my $distcopy= "/root/extract_$local.tar.gz";
-    target_putfile_root($ho, 300, $distpath{$part}, $distcopy);
-    target_cmd_root($ho, "cd / && tar zxf $distcopy", 300);
-}
-
 sub extract () {
     foreach my $part ('', 'kern', 'xen') {
-        extract_one($part, "path_${part}dist", $r{"${part}buildjob"});
+        target_extract_jobdistpath($ho, $part, "path_${part}dist",
+				   $r{"${part}buildjob"}, \%distpath);
     }
 }
 
-- 
2.39.5