b05b350108
- snapper rollback support (fate#317062) * add btrfs_follow_default.patch * add suse_btrfs_grub2_install.sh * add 80_suse_btrfs_snapshot * refresh grub2-snapper-plugin.sh - add grub2-x86_64-xen subpackage (bnc#863821) - ieee1275: check for IBM pseries emulated machine (bnc#869964) - added patches: * grub2-ppc64-build-ppc64-32bit.patch - Build ppc64 as 32bit - added patches: * grub2-ppc64-build-ppc64-32bit.patch - Rename PowerPC patches so it will have architecture in it's name - added patches: * grub2-ppc64le-01-Add-Little-Endian-support-for-Power64-to-the-build.patch * grub2-ppc64le-02-Build-grub-as-O1-until-we-add-savegpr-and-restgpr-ro.patch * grub2-ppc64le-03-disable-creation-of-vsx-and-altivec-instructions.patch * grub2-ppc64le-04-powerpc64-LE-s-linker-knows-how-to-handle-the-undefi.patch * grub2-ppc64le-05-grub-install-can-now-recognize-and-install-a-LE-grub.patch * grub2-ppc64le-06-set-the-ABI-version-to-0x02-in-the-e_flag-of-the-PPC.patch * grub2-ppc64le-07-Add-IEEE1275_ADDR-helper.patch * grub2-ppc64le-08-Fix-some-more-warnings-when-casting.patch * grub2-ppc64le-09-Add-powerpc64-types.patch * grub2-ppc64le-10-powerpc64-is-not-necessarily-BigEndian-anymore.patch * grub2-ppc64le-11-Fix-warnings-when-building-powerpc-linux-loader-64bi.patch * grub2-ppc64le-12-GRUB_ELF_R_PPC_-processing-is-applicable-only-for-32.patch OBS-URL: https://build.opensuse.org/request/show/228323 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=81
34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
From 90f6eed0b4ffdfe361c2966e62fcb8ed11b528bc Mon Sep 17 00:00:00 2001
|
|
From: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
|
|
Date: Thu, 20 Mar 2014 16:39:29 +0530
|
|
Subject: [PATCH] ieee1275: check for IBM pseries emulated machine
|
|
|
|
As there is no check for IBM pSeries qemu machine, is_qemu is not
|
|
set. So feature like GRUB_IEEE1275_FLAG_HAS_CURSORONOFF is not
|
|
enabled. This results in cursor not being displayed during the
|
|
grub-menu.
|
|
|
|
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 d92ae14..3e12e6b 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);
|
|
--
|
|
1.8.3.1
|