9bc71d03db
- Merge changes from SLE12 - Do not pass root= when root is on nfs (bnc#894374) * modified grub2-pass-corret-root-for-nfsroot.patch * modified grub2-secureboot-provide-linuxefi-config.patch * modified grub2-secureboot-use-linuxefi-on-uefi.patch - Fix xen pvops kernel not appear on menu (bnc#895286) * modified grub2-fix-menu-in-xen-host-server.patch - Workaround grub2-once (bnc#892358) * added grub2-btrfs-workaround-grub2-once.patch * added grub2-once.service * modified grub2-once - Fix busy-loop and hang while network booting (bnc#870613) * added grub2-netboot-hang.patch - Add warning in grubenv file about editing it directly (bnc#887008) * added grub2-editenv-add-warning-message.patch - Fix broken graphics with efifb on QEMU/KVM and nomodeset (bnc#884558) * added grub2-efi-disable-video-cirrus-and-bochus.patch - Disable video support on Power (bnc#877142) * added grub2-ppc64le-disable-video.patch - Track occupied memory so it can be released on exit (bnc#885026) * added grub2-ppc64le-memory-map.patch - Fix grub.xen config searching path on boot partition (bnc#884828) - Add linux16 and initrd16 to grub.xen (bnc#884830) * added grub2-xen-linux16.patch - VLAN tag support (fate#315753) * added 0001-Add-bootargs-parser-for-open-firmware.patch * added 0002-Add-Virtual-LAN-support.patch - Use chainloader to boot xen.efi under UEFI (bnc#871857) * added grub2-efi-xen-chainload.patch - Use device part of chainloader target, if present (bnc#871857) OBS-URL: https://build.opensuse.org/request/show/295632 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=148
41 lines
1.6 KiB
Diff
41 lines
1.6 KiB
Diff
From 86fdefd6b0d447cd7d3d80f794fcd4df2aa96792 Mon Sep 17 00:00:00 2001
|
|
From: Michael Chang <mchang@suse.com>
|
|
Date: Thu, 30 Aug 2012 15:27:50 +0800
|
|
Subject: [PATCH] fix Grub2 with SUSE Xen package install
|
|
|
|
References: bnc#774666
|
|
Patch-Mainline: no
|
|
|
|
This fixes Grub2 does not offer a Xen entry after installing hypervisor
|
|
and tools, which is caused by install sequence of xen-kernel and xen is
|
|
unpredictable.
|
|
|
|
By judging the system is dom0 with xen kernel installed, the xen_list
|
|
will be set to /boot/xen.gz if it's empty. Because the xen kernel would
|
|
trigger the config updated prior to the xen package installation.
|
|
---
|
|
util/grub.d/20_linux_xen.in | 13 +++++++++++++
|
|
1 files changed, 13 insertions(+), 0 deletions(-)
|
|
|
|
Index: grub-2.02~beta2/util/grub.d/20_linux_xen.in
|
|
===================================================================
|
|
--- grub-2.02~beta2.orig/util/grub.d/20_linux_xen.in
|
|
+++ grub-2.02~beta2/util/grub.d/20_linux_xen.in
|
|
@@ -182,6 +182,16 @@ else
|
|
if grub_file_is_not_garbage "$i" && file_is_not_sym "$i" ; then echo -n "$i " ; fi
|
|
done`
|
|
fi
|
|
+
|
|
+# bnc#774666 - Grub2 does not offer a Xen entry after installing hypervisor and tools
|
|
+# This is a workaround to the install sequence of xen-kernel and xen is unpredictable
|
|
+if [ "x${xen_list}" = "x" ]; then
|
|
+# If the code reaches here, it means that xen-kernel has been installed, but xen hypervisor
|
|
+# is missing. This is not likely a sane condition for dom0. We assume this is xen-kernel
|
|
+# triggers config update prior to the xen package.
|
|
+ xen_list="/boot/xen.gz"
|
|
+fi
|
|
+
|
|
prepare_boot_cache=
|
|
boot_device_id=
|
|
|