From: Ian Campbell <ian.campbell@citrix.com>
Date: Mon, 23 Sep 2013 09:14:02 +0000 (+0100)
Subject: Add -$suite suffix to TftpDiVersion in code
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ef3a6f2162ced5cfeb08b437315b69ad1ddbc5ed;p=people%2Fdariof%2Fosstest.git

Add -$suite suffix to TftpDiVersion in code

The suite differs by $arch but the config file arrangements only allow for a
single TftpDiVersion setting.
---

diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index 1a71af7..2fd899e 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -551,7 +551,7 @@ END
     foreach my $kp (keys %{ $ho->{Flags} }) {
 	$kp =~ s/need-kernel-deb-// or next;
 
-	my $d_i= $c{TftpPath}.'/'.$c{TftpDiBase}.'/'.$r{arch}.'/'.$c{TftpDiVersion};
+	my $d_i= $c{TftpPath}.'/'.$c{TftpDiBase}.'/'.$r{arch}.'/'.$c{TftpDiVersion}.'-'.$ho->{Suite};
 
 	my $kurl = create_webfile($ho, "kernel", sub {
 	    copy("$d_i/$kp.deb", $_[0]);
diff --git a/production-config b/production-config
index 3f98998..6a3afd8 100644
--- a/production-config
+++ b/production-config
@@ -72,7 +72,7 @@ TftpPxeDir /
 TftpPxeTemplates %ipaddrhex%/pxelinux.cfg
 
 TftpPxeGroup osstest
-TftpDiVersion 2012-01-30-squeeze
+TftpDiVersion 2012-01-30
 
 XenUsePath /usr/groups/xencore/systems/bin/xenuse
 
diff --git a/ts-host-install b/ts-host-install
index dfbc950..5c0018e 100755
--- a/ts-host-install
+++ b/ts-host-install
@@ -122,7 +122,7 @@ END
 sub setup_pxeboot_firstboot($) {
     my ($ps_url) = @_;
     
-    my $d_i= $c{TftpDiBase}.'/'.$r{arch}.'/'.$c{TftpDiVersion};
+    my $d_i= $c{TftpDiBase}.'/'.$r{arch}.'/'.$c{TftpDiVersion}.'-'.$ho->{Suite};
     
     my @installcmdline= qw(vga=normal);
     push @installcmdline, di_installcmdline_core($ho, $ps_url, %xopts);