From c8fd1bc66594438d4090eb371d61b9bc2a18e3b4 Mon Sep 17 00:00:00 2001
From: Darren Shepherd <darren@rancher.com>
Date: Mon, 6 Jun 2016 21:36:25 -0700
Subject: [PATCH] Pick vmlinuz then vmlinux

---
 scripts/layout | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/scripts/layout b/scripts/layout
index 0b02ed19..525c4b52 100755
--- a/scripts/layout
+++ b/scripts/layout
@@ -28,10 +28,13 @@ if [ -e ${DOWNLOADS}/kernel.tar.gz ]; then
     mkdir -p ${BUILD}/kernel
     tar xf ${DOWNLOADS}/kernel.tar.gz -C ${BUILD}/kernel
 
-    if [ -e ${BUILD}/kernel/boot/vmlinu* ]; then
-        mkdir -p dist/artifacts
-        cp ${BUILD}/kernel/boot/vmlinu* dist/artifacts/vmlinuz
-    fi
+    for i in vmlinuz vmlinux; do
+        if [ -e ${BUILD}/kernel/boot/${i}-* ]; then
+            mkdir -p dist/artifacts
+            cp ${BUILD}/kernel/boot/${i}-* dist/artifacts/vmlinuz
+            break
+        fi
+    done
 
     if [ -d ${BUILD}/kernel/lib ]; then
         rm -rf ${INITRD_DIR}/usr/lib