From: Ian Campbell <ian.campbell@citrix.com>
Date: Tue, 29 Sep 2015 09:44:54 +0000 (+0100)
Subject: Debian: Search for kernel in /boot as well as / when making u-boot script
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=07a7cdeb843af0540818690668d98c0d3575075a;p=people%2Fliuw%2Fosstest.git

Debian: Search for kernel in /boot as well as / when making u-boot script

The vmlinuz and initrd.img symlinks appear to have moved to /boot when
installing Jessie on armhf systems compared to Wheezy.

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

diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index 05f14a4..153b375 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -1102,8 +1102,21 @@ set -ex
 
 r=/target #/
 
-kernel=`readlink \$r/vmlinuz | sed -e 's|boot/||'`
-initrd=`readlink \$r/initrd.img | sed -e 's|boot/||'`
+if [ -f \$r/vmlinuz ] ; then
+    echo "Kernel+initrd symlinks are in /"
+    kernel=`readlink \$r/vmlinuz | sed -e 's|boot/||'`
+    initrd=`readlink \$r/initrd.img | sed -e 's|boot/||'`
+elif [ -f \$r/boot/vmlinuz ] ; then
+    echo "Kernel+initrd symlinks are in /boot"
+    kernel=`readlink \$r/boot/vmlinuz`
+    initrd=`readlink \$r/boot/initrd.img`
+else
+    echo "No kernel found!"
+    exit 1
+fi
+
+echo Using kernel \$kernel
+echo Using initrd \$initrd
 
 cat >\$r/boot/boot.deb <<EOF
 setenv bootargs $bootargs