ts-debian-di-install: Use correct per-arch name for kernel.

The x86 and arm kernels are inconsistently named upstream, and then
renamed in mg-debian-installer-update as:

            ====== KERNEL ============  ====== INITRD ==================
            Debian	   Osstest	Debian		   Osstest
            -----------    -----------  ---------------    -------------
x86/native: linux	=> linux	initrd.gz	=> initrd.gz
x86/xen:    xen/vmlinuz	=> vmlinuz-xen	xen/initrd.gz	=> initrd.gz-xen
arm/native: vmlinuz	=> linux	initrd.gz	=> initrd.gz
arm/xen:    vmlinuz	=> linux	initrd.gz	=> initrd.gz

Cope with this here, by treating the x86/xen (PV) case as the special
case that it is (due to the requirement of a separate i686-pae
installer kernel).

This goes unnoticed in the distros-debian flights because the kernel
is downloaded at runtime via a runvar. It matters once regular
(non-distro-debian) flights run with Jessie because then the d-i which
is used by the di based tests is taken from the result of
mg-debian-installer-update (e.g. for the -qcow2 flights etc).

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/ts-debian-di-install b/ts-debian-di-install
index 990569159297235019cc17c9ee941ba9b941c4f5..64b5d44a4b931cbb1c88bebb68a74b3f26278f7e 100755 (executable)
--- a/ts-debian-di-install
+++ b/ts-debian-di-install
@@ -153,10 +153,13 @@ sub setup_netboot($$$)
 
        my $di_path = $c{TftpPath}.'/'.$ho->{Tftp}{DiBase}.'/'.${arch}.'/'.$c{TftpDiVersion}.'-'.$ho->{Suite};
 
-        my $suffix = '';
-        $suffix .= "-xen" if ${arch} =~ m/amd64|i386/;
-       $kernel = "$di_path/vmlinuz$suffix";
-       $ramdisk = "$di_path/initrd.gz$suffix";
+        if (${arch} =~ m/amd64|i386/) {
+           $kernel = "$di_path/vmlinuz-xen";
+           $ramdisk = "$di_path/initrd.gz-xen";
+        } else {
+           $kernel = "$di_path/linux";
+           $ramdisk = "$di_path/initrd.gz";
+        }
 
        target_putfile_root($ho, 60, $kernel, "$didir/kernel_${suite}_${arch}");
        target_putfile_root($ho, 60, $ramdisk, "$didir/ramdisk_${suite}_${arch}");