]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
ieee1275: check for IBM pseries emulated machine
authorNikunj A Dadhania <nikunj@linux.vnet.ibm.com>
Thu, 20 Mar 2014 11:27:12 +0000 (16:57 +0530)
committerColin Watson <cjwatson@ubuntu.com>
Mon, 24 Mar 2014 15:44:33 +0000 (15:44 +0000)
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

index d92ae14f53e21ff1679364a79fcee91d4bc7c7f1..3e12e6b24e173e597c9c4801431cc8d9f71842f3 100644 (file)
@@ -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);