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 1a71af73b8c9dd2ae032650aed17d7d35d16e17e..2fd899ea3638e4718ea8ad304d6e77e436d42cbe 100644 (file)
--- 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 3f98998745ec001a2e7a319d54dc6d45fffe2250..6a3afd81fccb9b7a456302fbdddf0d11d4d32bec 100644 (file)
--- 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 dfbc950e7147e813d579f366c02e7c8d3788d34a..5c0018e14ada7952108ed331cfa7300863c41e8f 100755 (executable)
--- 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);