Accepting request 347723 from home:olh:branches:Base:System

- Rename grub2-xen.cfg to grub2-xen-pv-firmware.cfg (boo#926795)
- grub2-xen.cfg: to handle grub1 menu.lst in PV guest (boo#926795)

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

grub2-xen-pv-firmware.cfg

@@ -41,20 +41,33 @@ if [ -n "${suse_cddev_content}" -a -n "${suse_cddev_product}" -a "${suse_cddev_c
     set suse_cddev="${suse_cddev_content}"
 fi
 
-hdcfg_lst="/boot/grub2/grub.cfg \
+hdcfg_list="/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 \
+/grub2/grub.cfg"
+
+hdlst_list="/boot/grub/menu.lst \
 /grub/menu.lst"
 
-set hdcfg=""
-for c in ${hdcfg_lst}; do
+for c in ${hdcfg_list}; do
     if search -s hddev -f "${c}"; then
-        set hdcfg="${c}"
+        menuentry "${hddev} Boot From Hard Disk ($c)" {
+            set root="${hddev}"
+            configfile "${c}"
+        }
         break
-    fi 
+    fi
+done
+
+for c in ${hdlst_list}; do
+    if search -s hddev -f "${c}"; then
+        menuentry "${hddev} Boot From Hard Disk (${c})" {
+            set root="${hddev}"
+            legacy_configfile "${c}"
+        }
+        break
+    fi
 done
 
 set timeout=0
@@ -115,10 +128,3 @@ if [ -n "${suse_cddev}" ]; then
     fi
 fi
 
-if [ -n "${hddev}" ] ; then
-    set default="Boot From Hard Disk"
-    menuentry "${hddev} Boot From Hard Disk" {
-        set root="${hddev}"
-        configfile "${hdcfg}"
-    }
-fi

grub2.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Dec  7 08:03:41 UTC 2015 - olaf@aepfle.de
+
+- Rename grub2-xen.cfg to grub2-xen-pv-firmware.cfg (boo#926795)
+
+-------------------------------------------------------------------
+Fri Dec  4 17:06:17 UTC 2015 - olaf@aepfle.de
+
+- grub2-xen.cfg: to handle grub1 menu.lst in PV guest (boo#926795)
+
 -------------------------------------------------------------------
 Thu Nov 26 10:22:28 UTC 2015 - mchang@suse.com
 

grub2.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package grub2
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -146,7 +146,7 @@ Source11:       SLES-UEFI-CA-Certificate.crt
 Source12:       grub2-snapper-plugin.sh
 Source14:       80_suse_btrfs_snapshot
 Source15:       grub2-once.service
-Source16:       grub2-xen.cfg
+Source16:       grub2-xen-pv-firmware.cfg
 # required hook for systemd-sleep (bsc#941758)
 Source17:       grub2-systemd-sleep.sh
 Source1000:     PATCH_POLICY