Hello community, here is the log from the commit of package grub2 for openSUSE:Factory checked in at 2017-09-21 12:29:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grub2 (Old) and /work/SRC/openSUSE:Factory/.grub2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2" Thu Sep 21 12:29:21 2017 rev:169 rq:527631 version:2.02 Changes: -------- --- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2017-09-15 21:02:24.306675489 +0200 +++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2017-09-21 12:29:22.609434670 +0200 @@ -1,0 +2,12 @@ +Wed Sep 20 22:17:10 UTC 2017 - [email protected] + +- Use /boot/<arch>/loader/linux to determine if install media + is SUSE instead of /contents file (bsc#1054453) + +------------------------------------------------------------------- +Tue Sep 19 22:52:45 UTC 2017 - [email protected] + +- Use the pvops-enabled default kernel if the traditional xen + pv kernel and initrd are not found (bsc#1054453) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub2-xen-pv-firmware.cfg ++++++ --- /var/tmp/diff_new_pack.sDTPME/_old 2017-09-21 12:29:24.921109493 +0200 +++ /var/tmp/diff_new_pack.sDTPME/_new 2017-09-21 12:29:24.921109493 +0200 @@ -36,10 +36,19 @@ fi set suse_cddev="" -search -s suse_cddev_content -f "/content" -search -s suse_cddev_product -f "/media.1/products" -if [ -n "${suse_cddev_content}" -a -n "${suse_cddev_product}" -a "${suse_cddev_content}" = "${suse_cddev_product}" ]; then - set suse_cddev="${suse_cddev_content}" +if [ "${grub_cpu}" = "i386" ]; then + set suse_cdarch="i586" +else + set suse_cdarch="${grub_cpu}" +fi +if [ -n "${suse_cdarch}" ]; then + set suse_kern="/boot/${suse_cdarch}/loader/linux" + set suse_initrd="/boot/${suse_cdarch}/loader/initrd" + search -s suse_cdkern -f "${suse_kern}" + search -s suse_cdinitrd -f "${suse_initrd}" + if [ -n "${suse_cdkern}" -a -n "${suse_cdinitrd}" -a "${suse_cdkern}" = "${suse_cdinitrd}" ]; then + set suse_cddev="${suse_cdkern}" + fi fi set hdcfg_list="\ @@ -115,33 +124,30 @@ fi if [ -n "${suse_cddev}" ]; then - if [ "${grub_cpu}" = "i386" ]; then - set suse_cdarch="i586" - else - set suse_cdarch="${grub_cpu}" - fi 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_kern="/boot/${suse_cdarch}/vmlinuz-xen" + set suse_initrd="/boot/${suse_cdarch}/initrd-xen" + fi if [ -f "${suse_cdcfg}" ]; then menuentry "${suse_cddev} SUSE Install menu" { set root="${suse_cddev}" configfile "${suse_cdcfg}" } - elif [ -f "${suse_cdkern}" -a -f "$suse_cdinitrd" ]; then + elif [ -f "${suse_kern}" -a -f "$suse_initrd" ]; then menuentry "${suse_cddev} SUSE Install" { - linux "${suse_cdkern}" linemode=1 xencons=hvc0 - initrd "${suse_cdinitrd}" + linux "${suse_kern}" linemode=1 xencons=hvc0 + initrd "${suse_initrd}" } menuentry "${suse_cddev} SUSE Rescue" { - linux "${suse_cdkern}" linemode=1 xencons=hvc0 rescue=1 - initrd "${suse_cdinitrd}" + linux "${suse_kern}" linemode=1 xencons=hvc0 rescue=1 + initrd "${suse_initrd}" } menuentry "${suse_cddev} SUSE Upgrade" { - linux "${suse_cdkern}" linemode=1 xencons=hvc0 upgrade=1 - initrd "${suse_cdinitrd}" + linux "${suse_kern}" linemode=1 xencons=hvc0 upgrade=1 + initrd "${suse_initrd}" } else echo "the device ${suse_cddev} is not xen pv bootable"
