X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=appliance%2Flibguestfs-supermin-helper.in;h=ab3aad5304277c5f1d24d41ab7ac3196d8693730;hb=677e021225d05e92034a68cb9a9b487e5331d35d;hp=87fb6882c1b2b42230f0095d63f289de2ebf8170;hpb=6cb84b6e94f424afb9e25b392148fe679d4c7d51;p=libguestfs.git

diff --git a/appliance/libguestfs-supermin-helper.in b/appliance/libguestfs-supermin-helper.in
index 87fb688..ab3aad5 100755
--- a/appliance/libguestfs-supermin-helper.in
+++ b/appliance/libguestfs-supermin-helper.in
@@ -29,17 +29,32 @@ sourcedir=$(cd "$1" > /dev/null; pwd)
 kernel="$2"
 initrd="$3"
 
-# Look for the kernel first.  This is very unsophisticated: We
-# just look for any kernel named vmlinuz-*.$host_cpu which has a
-# corresponding /lib/modules/*.$host_cpu directory.
+# Kernel:
+# 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.
+#
+# RHEL 5 didn't append the arch to the kernel name, so look for kernels
+# without arch second.
+
+arch=$(echo "@host_cpu@" | sed 's/^i.86$/i?86/')
+kernels=$(
+    ls -1dvr /boot/vmlinuz-*.$arch* 2>/dev/null | grep -v xen ||: ;
+    ls -1dvr /boot/vmlinuz-* 2>/dev/null | grep -v xen
+)
+
+if [ -z "$kernels" ]; then
+    echo "$0: failed to find a suitable kernel in /boot directory" >&2
+    exit 1
+fi
 
-for f in /boot/vmlinuz-*.@host_cpu@; do
+for f in $kernels; do
     b=$(basename "$f")
     b=$(echo "$b" | sed 's,vmlinuz-,,')
     modpath="/lib/modules/$b"
     if [ -d "$modpath" ]; then
-	ln -sf "$f" "$kernel"
-	break
+        ln -sf "$f" "$kernel"
+        break
     fi
     modpath=
 done
@@ -77,4 +92,4 @@ find "$modpath" \( -not -name '*.ko' $whitelist \) -a -print0 |
   ls -1df $(
       cat "$sourcedir"/initramfs.@REPO@.@host_cpu@.supermin.hostfiles
     ) 2>/dev/null |
-  cpio --quiet -o -H newc ) >> "$initrd"
+  cpio -C 65536 --quiet -o -H newc ) >> "$initrd"