Skip to contentSkip to conversation

grub-mkconfig: fix Xen platform conditions

PATCH In review Andrey Borzenkov 2 participants 2 messages Dec 22, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 grub-mkconfig: fix Xen platform conditions

---
 util/grub-mkconfig.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
util/grub-mkconfig.in +2 -2
index fe33092..02a455e 100644
@@ -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
Signature · 1 line
tg: (3bf2db8..) u/grub-mkconfig-efi64-etc (depends on: master)
#1 lore raw
Quoted 11 lines · Andrey Borzenkov
---
 util/grub-mkconfig.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
util/grub-mkconfig.in +0 -0
index fe33092..02a455e 100644
@@ -284,9 +284,9 @@ for i in "${grub_mkconfig_dir}"/* ; do
 		      xx86)

util/grub-mkconfig.in for i in "${grub_mkconfig_dir}"/* ; do · line 292

Quoted 10 lines
util/grub-mkconfig.in +2 -2
 			  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

Nice catch. Go ahead.