From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH OSSTEST 2/6] Debian: Search for kernel in /boot as well as / when making u-boot script Date: Tue, 29 Sep 2015 10:44:54 +0100 Message-ID: <1443519898-24444-2-git-send-email-ian.campbell@citrix.com> References: <1443519883.16718.23.camel@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1443519883.16718.23.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 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 --- 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 <