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