* util/grub.d/20_linux_xen.in: Accept old-style xen kernels.

diff --git a/ChangeLog b/ChangeLog
index e93ffe4c46ed67ec56b7882f3a2168dfe665229c..073543c1630eb0a3242efeecb71a60a86332bcd3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-29  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * util/grub.d/20_linux_xen.in: Accept old-style xen kernels.
+
 2011-03-29  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * include/grub/lvm.h (grub_lvm_lv): New field 'visible'.

diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
index e71fc145892ace552052305db21b27ab8c2da291..bacd8ffeada3995704a0608a82aac101fac533b6 100644 (file)
--- a/util/grub.d/20_linux_xen.in
+++ b/util/grub.d/20_linux_xen.in
@@ -96,7 +96,7 @@ EOF
 linux_list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* ; do
        basename=$(basename $i)
        version=$(echo $basename | sed -e "s,^[^0-9]*-,,g")
-        if grub_file_is_not_garbage "$i" && grep -qx "CONFIG_XEN_DOM0=y" /boot/config-${version} 2> /dev/null ; then echo -n "$i " ; fi
+        if grub_file_is_not_garbage "$i" && (grep -qx "CONFIG_XEN_DOM0=y" /boot/config-${version} 2> /dev/null || grep -qx "CONFIG_XEN_PRIVILEGED_GUEST=y" /boot/config-${version} 2> /dev/null); then echo -n "$i " ; fi
       done`
 if [ "x${linux_list}" = "x" ] ; then
     exit 0