From: Ian Campbell <ian.campbell@citrix.com>
Date: Mon, 18 Jan 2016 14:28:51 +0000 (+0000)
Subject: ts-host-install: Support DiVersion coming from runvars
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f3ee1b85a4c9531c63a20e3372e34c4f77ebba5e;p=people%2Fliuw%2Fosstest.git

ts-host-install: Support DiVersion coming from runvars

To do so initialise $ho->{DiVersion} in select host and use it in
ts-host-install.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
[ ijc missing s/diversion/di_version in selecthost ]
---

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 68af10d..0b3e18a 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -862,6 +862,7 @@ sub selecthost ($) {
     };
     if (defined $job) {
 	$ho->{Suite} = target_var($ho, "suite") // $c{DebianSuite};
+	$ho->{DiVersion} = target_var($ho, "di_version") // $c{TftpDiVersion};
     }
 
     #----- handle hosts which are themselves guests (nested) -----
diff --git a/ts-host-install b/ts-host-install
index eb740fa..ecf5f0b 100755
--- a/ts-host-install
+++ b/ts-host-install
@@ -157,7 +157,7 @@ END
 sub setup_pxeboot_firstboot($) {
     my ($ps_url) = @_;
     
-    my $d_i= $ho->{Tftp}{DiBase}.'/'.$r{arch}.'/'.$c{TftpDiVersion}.'-'.$ho->{Suite};
+    my $d_i= $ho->{Tftp}{DiBase}.'/'.$r{arch}.'/'.$ho->{DiVersion}.'-'.$ho->{Suite};
     
     my @dicmdline= qw(vga=normal);
     push @dicmdline, di_installcmdline_core($ho, $ps_url, %xopts);