[PATCH OSSTEST 2/6] Debian: Search for kernel in /boot as well as / when making u-boot script

[Ian Campbell <ian.campbell@citrix.com>]

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>
---
 Osstest/Debian.pm | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index f7275de..36d9ca3 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -1092,8 +1092,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
-- 
2.5.3