Accepting request 346456 from home:michael-chang:branches:Base:System

- Expand list of grub.cfg search path in PV Xen guest for systems
  installed to btrfs snapshot. (bsc#946148) (bsc#952539) 
  * modified grub2-xen.cfg
- drop grub2-fix-Grub2-with-SUSE-Xen-package-install.patch (bsc#774666)

OBS-URL: https://build.opensuse.org/request/show/346456
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=190

grub2-fix-Grub2-with-SUSE-Xen-package-install.patch

@@ -1,40 +0,0 @@
-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=
- 

grub2-xen.cfg

@@ -43,6 +43,8 @@ fi
 
 hdcfg_lst="/boot/grub2/grub.cfg \
 /@/boot/grub2/grub.cfg \
+/@/.snapshots/1/snapshot/boot/grub2/grub.cfg \
+/.snapshots/1/snapshot/boot/grub2/grub.cfg \
 /boot/grub/menu.lst \
 /grub2/grub.cfg \
 /grub/menu.lst"

grub2.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Nov 26 10:22:28 UTC 2015 - mchang@suse.com
+
+- Expand list of grub.cfg search path in PV Xen guest for systems
+  installed to btrfs snapshot. (bsc#946148) (bsc#952539) 
+  * modified grub2-xen.cfg
+- drop grub2-fix-Grub2-with-SUSE-Xen-package-install.patch (bsc#774666)
+
 -------------------------------------------------------------------
 Wed Nov 18 19:33:42 UTC 2015 - arvidjaar@gmail.com
 

grub2.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package grub2
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -160,7 +160,6 @@ Patch9:         grub2-GRUB_CMDLINE_LINUX_RECOVERY-for-recovery-mode.patch
 Patch10:        grub2-fix-error-terminal-gfxterm-isn-t-found.patch
 Patch12:        grub2-fix-menu-in-xen-host-server.patch
 Patch15:        not-display-menu-when-boot-once.patch
-Patch16:        grub2-fix-Grub2-with-SUSE-Xen-package-install.patch
 Patch17:        grub2-pass-corret-root-for-nfsroot.patch
 Patch18:        grub2-fix-locale-en.mo.gz-not-found-error-message.patch
 Patch19:        grub2-efi-HP-workaround.patch
@@ -436,7 +435,6 @@ mv po/grub.pot po/%{name}.pot
 %patch10 -p1
 %patch12 -p1
 %patch15 -p1
-%patch16 -p1
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1