From 77ec462a568fc9c89ef45e960bf33b5de73140fb Mon Sep 17 00:00:00 2001 From: Andrey Borzenkov Date: Sun, 22 Dec 2013 23:47:26 +0400 Subject: [PATCH] grub-mkconfig: fix Xen platform conditions --- ChangeLog | 4 ++++ util/grub-mkconfig.in | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d24ec4cfb..5279dac50 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-12-22 Andrey Borzenkov + + * util/grub-mkconfig.in: Fix Xen platform conditions. + 2013-12-22 Andrey Borzenkov * util/grub-mkrescue.c: Split single help message string in several diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in index fe33092f9..02a455eca 100644 --- 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