* util/grub.d/10_linux.in: Fix detection of genkernel initramfs.

diff --git a/ChangeLog b/ChangeLog
index 5e14b639cd511e92b26cbfc07698ce6028bd2179..84ad00af1218639554e8e930a14cf1425e73d1f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-04-18  Mike Gilbert  <floppym@gentoo.org>
+
+       * util/grub.d/10_linux.in: Fix detection of genkernel initramfs.
+
 2012-04-18  Bean  <bean123ch@gmail.com>
 
        * grub-core/disk/ata.c (grub_ata_strncpy): Put terminating zero at right

diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 8c75fab296e09a19d4964e9b92622a7f0dd404ab..14402e86cc830f89d097db43c46b9dc6f35c30fd 100644 (file)
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -150,7 +150,8 @@ EOF
 EOF
 }
 
-case x`uname -m` in
+machine=`uname -m`
+case "x$machine" in
     xi?86 | xx86_64)
        list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do
                   if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
@@ -161,6 +162,14 @@ case x`uname -m` in
             done` ;;
 esac
 
+case "$machine" in
+    i?86) GENKERNEL_ARCH="x86" ;;
+    mips|mips64) GENKERNEL_ARCH="mips" ;;
+    mipsel|mips64el) GENKERNEL_ARCH="mipsel" ;;
+    arm*) GENKERNEL_ARCH="arm" ;;
+    *) GENKERNEL_ARCH="$machine" ;;
+esac
+
 prepare_boot_cache=
 prepare_root_cache=
 boot_device_id=
@@ -187,7 +196,9 @@ while [ "x$list" != "x" ] ; do
           "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
           "initrd-${alt_version}" "initramfs-${alt_version}.img" \
           "initramfs-genkernel-${version}" \
-          "initramfs-genkernel-${alt_version}"; do
+          "initramfs-genkernel-${alt_version}" \
+          "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
+          "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
     if test -e "${dirname}/${i}" ; then
       initrd="$i"
       break