grub-mkconfig: fix Xen platform conditions

diff --git a/ChangeLog b/ChangeLog
index d24ec4cfb80c369d55189673d91d2a222d3bf6fc..5279dac50d0fed5097d487a6434b6cbb5b642fdc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-22  Andrey Borzenkov <arvidjaar@gmail.com>
+
+       * util/grub-mkconfig.in: Fix Xen platform conditions.
+
 2013-12-22  Andrey Borzenkov <arvidjaar@gmail.com>
 
        * util/grub-mkrescue.c: Split single help message string in several

diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index fe33092f9f049f13d07f43f498b25d99ad577257..02a455eca35652e660ff4e102a0fcb6a2f6c7c18 100644 (file)
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -284,9 +284,9 @@ for i in "${grub_mkconfig_dir}"/* ; do
                      xx86)
                          echo "if [ x\"\$grub_platform\" != xxen \\(  x\"\$grub_cpu\" = xi386 -o x\"\$grub_cpu\" = xx86_64 -o x\"\$grub_platform\" = x \\) ]; then" ;;
                      xi386-xen-pae)
-                         echo "if [ x\"\$grub_cpu-\$grub_platform\" = xi386-xen -o x\"\$grub_cpu-\$grub_platform\" = x ]; then" ;;
+                         echo "if [ x\"\$grub_cpu-\$grub_platform\" = xi386-xen -o x\"\$grub_cpu-\$grub_platform\" = x- ]; then" ;;
                      xx86_64-xen)
-                         echo "if [ x\"\$grub_cpu-\$grub_platform\" = xx86_64-xen -o x\"\$grub_cpu-\$grub_platform\" = x ]; then" ;;
+                         echo "if [ x\"\$grub_cpu-\$grub_platform\" = xx86_64-xen -o x\"\$grub_cpu-\$grub_platform\" = x- ]; then" ;;
                      *)
                          echo "if [ x\"\$grub_cpu\" = x$platform -o x\"\$grub_platform\" = x ]; then" ;;
                  esac