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