dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0066-ieee1275-check-for-IBM-pseries-emulated-machine.patch

23d2ea
From 735117103884aaa27fe4875ef556b2d17cfe107e Mon Sep 17 00:00:00 2001
39700a
From: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
39700a
Date: Thu, 20 Mar 2014 16:57:12 +0530
27a4da
Subject: [PATCH 066/260] ieee1275: check for IBM pseries emulated machine
39700a
39700a
is_qemu is not being set lead to disabling of feature like
39700a
GRUB_IEEE1275_FLAG_HAS_CURSORONOFF. This resulted in cursor not being
39700a
displayed during the grub-menu edit.
39700a
39700a
Signed-off-by: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
39700a
---
39700a
 grub-core/kern/ieee1275/cmain.c | 4 +++-
39700a
 1 file changed, 3 insertions(+), 1 deletion(-)
39700a
39700a
diff --git a/grub-core/kern/ieee1275/cmain.c b/grub-core/kern/ieee1275/cmain.c
27a4da
index d92ae14f5..3e12e6b24 100644
39700a
--- a/grub-core/kern/ieee1275/cmain.c
39700a
+++ b/grub-core/kern/ieee1275/cmain.c
39700a
@@ -84,8 +84,10 @@ grub_ieee1275_find_options (void)
39700a
 
39700a
   rc = grub_ieee1275_get_property (root, "model",
39700a
 				   tmp,	sizeof (tmp), 0);
39700a
-  if (rc >= 0 && !grub_strcmp (tmp, "Emulated PC"))
39700a
+  if (rc >= 0 && (!grub_strcmp (tmp, "Emulated PC")
39700a
+		  || !grub_strcmp (tmp, "IBM pSeries (emulated by qemu)"))) {
39700a
     is_qemu = 1;
39700a
+  }
39700a
 
39700a
   if (rc >= 0 && grub_strncmp (tmp, "IBM", 3) == 0)
39700a
     grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_NO_TREE_SCANNING_FOR_DISKS);
39700a
-- 
27a4da
2.13.0
39700a