From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 29 Mar 2011 19:12:13 +0000 (+0200)
Subject: 	* util/grub.d/20_linux_xen.in: Accept old-style xen kernels.
X-Git-Tag: 1.99~137
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1eb511d9a069dd09472889322ff53844e56e432;p=thirdparty%2Fgrub.git

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

diff --git a/ChangeLog b/ChangeLog
index e93ffe4c4..073543c16 100644
--- 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 e71fc1458..bacd8ffea 100644
--- 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