* util/grub.d/10_linux.in: Add gentoo-specific config filename.

	* util/grub.d/20_linux_xen.in: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 95e7363a23f54610f1d7df55c9a25741592d0703..d0f2acaccb870e07a0ac1545b40b805b7df4c146 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-30  Alexey Shvetsov <alexxy@gentoo.org>
+
+       * util/grub.d/10_linux.in: Add gentoo-specific config filename.
+       * util/grub.d/20_linux_xen.in: Likewise.
+
 2011-03-30  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * util/grub.d/10_linux.in: Try alternative config filenames where

diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 4f8a7927cfb2fc10340d7f311af765ab22b82682..930ce06ef9655d964a94fd48866e2b95ccd88cf1 100644 (file)
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -148,9 +148,9 @@ while [ "x$list" != "x" ] ; do
   done
 
   config=
-  for i in "config-${version}" "config-${alt_version}"; do
-    if test -e "${dirname}/${i}" ; then
-      config="${dirname}/${i}"
+  for i in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do
+    if test -e "${i}" ; then
+      config="${i}"
       break
     fi
   done

diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
index 59a953ebb44016a4b08e13c7938e9b7424d74567..858627aa3cc053ecc103c7811082ba95d5cdbcdc 100644 (file)
--- a/util/grub.d/20_linux_xen.in
+++ b/util/grub.d/20_linux_xen.in
@@ -99,9 +99,9 @@ linux_list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* /boot/kernel-*; do
        version=$(echo $basename | sed -e "s,^[^0-9]*-,,g")
        dirname=$(dirname $i)
        config=
-       for j in "config-${version}" "config-${alt_version}"; do
-           if test -e "${dirname}/${j}" ; then
-               config="${dirname}/${j}"
+       for j in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do
+           if test -e "${j}" ; then
+               config="${j}"
                break
            fi
        done