SHA256
1
0
forked from pool/grub2

Accepting request 527417 from home:mlatimer:branches:Base:System

Use pvops-enabled default kernel if traditional xen kernel does not exit (bsc#1054453)

OBS-URL: https://build.opensuse.org/request/show/527417
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=278
This commit is contained in:
Michael Chang 2017-09-20 04:29:01 +00:00 committed by Git OBS Bridge
parent f7b29ac20a
commit 4cd016df9e
2 changed files with 13 additions and 2 deletions

View File

@ -123,8 +123,13 @@ if [ -n "${suse_cddev}" ]; then
set timeout=8
set root="${suse_cddev}"
set suse_cdcfg="/boot/${suse_cdarch}/grub2-xen/grub.cfg"
set suse_cdkern="/boot/${suse_cdarch}/vmlinuz-xen"
set suse_cdinitrd="/boot/${suse_cdarch}/initrd-xen"
if [ -e "/boot/${suse_cdarch}/vmlinuz-xen" ]; then
set suse_cdkern="/boot/${suse_cdarch}/vmlinuz-xen"
set suse_cdinitrd="/boot/${suse_cdarch}/initrd-xen"
else
set suse_cdkern="/boot/${suse_cdarch}/loader/linux"
set suse_cdinitrd="/boot/${suse_cdarch}/loader/initrd"
fi
if [ -f "${suse_cdcfg}" ]; then
menuentry "${suse_cddev} SUSE Install menu" {
set root="${suse_cddev}"

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Sep 19 22:52:45 UTC 2017 - mlatimer@suse.com
- Use the pvops-enabled default kernel if the traditional xen
pv kernel and initrd are not found (bsc#1054453)
-------------------------------------------------------------------
Fri Sep 8 08:04:41 UTC 2017 - agraf@suse.com