diff mbox

[OSSTEST,v2,06/12] ts-host-install: Support DiVersion coming from runvars

Message ID 1453127337-16136-6-git-send-email-ian.campbell@citrix.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ian Campbell Jan. 18, 2016, 2:28 p.m. UTC 
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>
---
 Osstest/TestSupport.pm | 1 +
 ts-host-install        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
diff mbox

Patch

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index a42a9ee..2a7340f 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, "diversion") // $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);