From: Matthew Booth <mbooth@redhat.com>
Date: Tue, 23 Jun 2009 16:35:40 +0000 (+0100)
Subject: Make the supermin helper look for any x86 kernel
X-Git-Tag: 1.0.52~8
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=d2c0ee0ff7a9afdcdc1605dd464760f98d1b57d7;p=libguestfs.git

Make the supermin helper look for any x86 kernel

If you've got a non-PAE kernel installed on an i686 machine, the kernel
architecture is i586. This change makes sure that supermin finds the
installed kernel.
---

diff --git a/appliance/libguestfs-supermin-helper.in b/appliance/libguestfs-supermin-helper.in
index d7c8d96..2afd0cf 100755
--- a/appliance/libguestfs-supermin-helper.in
+++ b/appliance/libguestfs-supermin-helper.in
@@ -30,12 +30,12 @@ kernel="$2"
 initrd="$3"
 
 # Kernel:
-# Look for any kernel named vmlinuz-*.$host_cpu* which has
-# a corresponding /lib/modules/*.$host_cpu* directory.
-# However by sorting on reverse version (ls -vr) we ensure
-# we choose the newest kernels.
+# Look for the most recent kernel named vmlinuz-*.<arch>* which has a
+# corresponding directory in /lib/modules/. If the architecture is x86, look
+# for any x86 kernel.
 
-for f in $(ls -1vr /boot/vmlinuz-*.@host_cpu@* | grep -v xen); do
+arch=$(echo "@host_cpu@" | sed 's/^i.86$/i?86/')
+for f in $(ls -1vr /boot/vmlinuz-*.$arch* 2>/dev/null | grep -v xen); do
     b=$(basename "$f")
     b=$(echo "$b" | sed 's,vmlinuz-,,')
     modpath="/lib/modules/$b"