From: Colin Watson Date: Mon, 23 Dec 2013 23:32:20 +0000 (+0100) Subject: mkconfig fix by Colin X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9fa053b69b0f4760d55fb589c7fd3c956db6f39;p=thirdparty%2Fgrub.git mkconfig fix by Colin --- diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in index 02a455eca..abeebf6b9 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in @@ -282,7 +282,7 @@ for i in "${grub_mkconfig_dir}"/* ; do echo "### BEGIN $i ($platform) ###" case x$platform in xx86) - echo "if [ x\"\$grub_platform\" != xxen \\( x\"\$grub_cpu\" = xi386 -o x\"\$grub_cpu\" = xx86_64 -o x\"\$grub_platform\" = x \\) ]; then" ;; + echo "if [ x\"\$grub_platform\" != xxen -a \\( 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" ;; xx86_64-xen)