dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

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

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