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 68af10d9579edfbd226924fb77ce8eb227a7d2eb..0b3e18a48304b779f59ae0de8125074b2fe165c6 100644 (file)
--- 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 eb740fa95beecf5fa7d706b1e7a70ed2d55d2aca..ecf5f0b1f72089c851d058e397fff11367e8e461 100755 (executable)
--- 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);