]>
Commit | Line | Data |
---|---|---|
52b72f89 | 1 | From ba554826ccfc6ad3af1256b8d8422ee84de751b2 Mon Sep 17 00:00:00 2001 |
fa992291 CW |
2 | From: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com> |
3 | Date: Thu, 20 Mar 2014 16:57:12 +0530 | |
4 | Subject: ieee1275: check for IBM pseries emulated machine | |
5 | ||
6 | is_qemu is not being set lead to disabling of feature like | |
7 | GRUB_IEEE1275_FLAG_HAS_CURSORONOFF. This resulted in cursor not being | |
8 | displayed during the grub-menu edit. | |
9 | ||
10 | Author: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com> | |
11 | Origin: upstream, http://git.savannah.gnu.org/gitweb/?p=grub.git;a=commitdiff;h=e4a1fe391906bfcd1a778c5ec4e242c4b07d429d | |
12 | Forwarded: not-needed | |
13 | Last-Update: 2014-03-24 | |
14 | ||
15 | Patch-Name: ieee1275-pseries-emulation.patch | |
16 | --- | |
17 | grub-core/kern/ieee1275/cmain.c | 4 +++- | |
18 | 1 file changed, 3 insertions(+), 1 deletion(-) | |
19 | ||
20 | diff --git a/grub-core/kern/ieee1275/cmain.c b/grub-core/kern/ieee1275/cmain.c | |
21 | index d92ae14..3e12e6b 100644 | |
22 | --- a/grub-core/kern/ieee1275/cmain.c | |
23 | +++ b/grub-core/kern/ieee1275/cmain.c | |
24 | @@ -84,8 +84,10 @@ grub_ieee1275_find_options (void) | |
25 | ||
26 | rc = grub_ieee1275_get_property (root, "model", | |
27 | tmp, sizeof (tmp), 0); | |
28 | - if (rc >= 0 && !grub_strcmp (tmp, "Emulated PC")) | |
29 | + if (rc >= 0 && (!grub_strcmp (tmp, "Emulated PC") | |
30 | + || !grub_strcmp (tmp, "IBM pSeries (emulated by qemu)"))) { | |
31 | is_qemu = 1; | |
32 | + } | |
33 | ||
34 | if (rc >= 0 && grub_strncmp (tmp, "IBM", 3) == 0) | |
35 | grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_NO_TREE_SCANNING_FOR_DISKS); |