From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH OSSTEST v2 6/8] ts-debian-di-install: Use correct per-arch name for kernel. Date: Tue, 6 Oct 2015 13:47:04 +0100 Message-ID: <1444135626-1771-6-git-send-email-ian.campbell@citrix.com> References: <1444135606.5302.145.camel@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1444135606.5302.145.camel@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: ian.jackson@eu.citrix.com, xen-devel@lists.xen.org Cc: Ian Campbell List-Id: xen-devel@lists.xenproject.org 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 --- v2: New patch --- ts-debian-di-install | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ts-debian-di-install b/ts-debian-di-install index 9905691..64b5d44 100755 --- 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}"); -- 2.5.3