summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Jones <rjones@centos5x32.home.annexia.org>2009-07-07 17:33:47 +0100
committerRichard Jones <rjones@centos5x32.home.annexia.org>2009-07-07 17:33:47 +0100
commit2e632a654f82a86c0bd29d935d1ed0b5db46113d (patch)
tree06e5b0e91bc5b9d8de0354045a9e8e9f83337cda
parent11400fde901e1c7a6d3c3887f322af66374793c2 (diff)
downloadlibguestfs-2e632a654f82a86c0bd29d935d1ed0b5db46113d.tar.gz
libguestfs-2e632a654f82a86c0bd29d935d1ed0b5db46113d.tar.xz
libguestfs-2e632a654f82a86c0bd29d935d1ed0b5db46113d.zip
RHEL 5: RHEL kernels don't have $arch at the end, so look for non-arch kernels too.
-rwxr-xr-xappliance/libguestfs-supermin-helper.in6
1 files changed, 5 insertions, 1 deletions
diff --git a/appliance/libguestfs-supermin-helper.in b/appliance/libguestfs-supermin-helper.in
index 2afd0cfa..e521020b 100755
--- a/appliance/libguestfs-supermin-helper.in
+++ b/appliance/libguestfs-supermin-helper.in
@@ -33,9 +33,13 @@ initrd="$3"
# 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/')
-for f in $(ls -1vr /boot/vmlinuz-*.$arch* 2>/dev/null | grep -v xen); do
+kernels=$(ls -1vr /boot/vmlinuz-*.$arch* 2>/dev/null | grep -v xen; ls -1vr /boot/vmlinuz-* 2>/dev/null | grep -v xen)
+for f in $kernels; do
b=$(basename "$f")
b=$(echo "$b" | sed 's,vmlinuz-,,')
modpath="/lib/modules/$b"