* util/grub.d/10_linux.in: Refactor search for initrd. Add

support for initrd names used in Fedora.

diff --git a/ChangeLog b/ChangeLog
index 1552d831ceb65df44760e661f3385b20abbd8f12..a6ad8cbf2d4e49b474536bc918105ff6c74f97e2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-19  Pavel Roskin  <proski@gnu.org>
+
+       * util/grub.d/10_linux.in: Refactor search for initrd.  Add
+       support for initrd names used in Fedora.
+
 2007-12-26  Bean  <bean123ch@gmail.com>
 
        * conf/common.rmk (pkgdata_MODULES): Add cpio.mod.

diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 9a302a10b4a919ad80dacfe7622e51661bfed6c4..d7c948d22efdb0a0fc9ab94c4996a5559f7c7f11 100644 (file)
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -84,30 +84,43 @@ while [ "x$list" != "x" ] ; do
   dirname=`dirname $linux`
   grub_dirname=`echo ${dirname} | sed -e "s%^/boot%${GRUB_DRIVE_BOOT}%g"`
   version=`echo $basename | sed -e "s,^[^0-9]*-,,g"`
+
+  initrd=
+  for i in "initrd.img-${version}" "initrd-${version}.img"; do
+    if test -e "${dirname}/${i}" ; then
+      initrd="$i"
+      break
+    fi
+  done
+  if test -n "${initrd}" ; then
+    echo "Found initrd image: ${dirname}/${initrd}" >&2
+  fi
+
   cat << EOF
 menuentry "${OS}, linux ${version}" {
        linux   ${grub_dirname}/${basename} root=${GRUB_DEVICE} ro ${GRUB_CMDLINE_LINUX}
 EOF
-  if test -e ${dirname}/initrd.img-${version} ; then
-    echo "Found initrd image: ${dirname}/initrd.img-${version}" >&2
+  if test -n "${initrd}" ; then
     cat << EOF
-       initrd  ${grub_dirname}/initrd.img-${version}
+       initrd  ${grub_dirname}/${initrd}
 EOF
   fi
   cat << EOF
 }
 EOF
+
   cat << EOF
 menuentry "${OS}, linux ${version} (single-user mode)" {
        linux   ${grub_dirname}/${basename} root=${GRUB_DEVICE} ro single ${GRUB_CMDLINE_LINUX}
 EOF
-  if test -e ${dirname}/initrd.img-${version} ; then
+  if test -n "${initrd}" ; then
     cat << EOF
-       initrd  ${grub_dirname}/initrd.img-${version}
+       initrd  ${grub_dirname}/${initrd}
 EOF
   fi
   cat << EOF
 }
 EOF
+
   list=`echo $list | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '`
 done