Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package shim-leap for openSUSE:Factory
checked in at 2021-05-20 19:25:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/shim-leap (Old)
and /work/SRC/openSUSE:Factory/.shim-leap.new.2988 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "shim-leap"
Thu May 20 19:25:05 2021 rev:17 rq:894459 version:15.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/shim-leap/shim-leap.changes 2021-05-07
16:46:22.252161150 +0200
+++ /work/SRC/openSUSE:Factory/.shim-leap.new.2988/shim-leap.changes
2021-05-20 19:25:35.273812675 +0200
@@ -1,0 +2,8 @@
+Thu May 20 01:25:06 UTC 2021 - Gary Ching-Pang Lin <g...@suse.com>
+
+- shim-install: instead of assuming "removable" for Azure, remove
+ fallback.efi from \EFI\Boot and copy grub.efi/cfg to \EFI\Boot
+ to make \EFI\Boot bootable and keep the boot option created by
+ efibootmgr (bsc#1185464, bsc#1185961)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ shim-install ++++++
--- /var/tmp/diff_new_pack.LT6eQB/_old 2021-05-20 19:25:35.749810722 +0200
+++ /var/tmp/diff_new_pack.LT6eQB/_new 2021-05-20 19:25:35.753810705 +0200
@@ -221,15 +221,6 @@
esac
done
-# bsc#1185464
-# The Azure firmware doesn't respect the boot option created by either
-# efibootmgr or fallback.efi so we have to skip the installation of
-# fallback.efi to avoid the endless reset loop.
-if is_azure; then
- no_nvram=yes
- removable=yes
-fi
-
if test -n "$efidir"; then
efi_fs=`"$grub_probe" --target=fs "${efidir}"`
if test "x$efi_fs" = xfat; then :; else
@@ -441,3 +432,22 @@
fi
fi
+# bsc#1185464 bsc#1185961
+# The Azure firmware sometimes doesn't respect the boot option created by
+# either efibootmgr or fallback.efi so we have to remove fallback.efi to
+# avoid the endless reset loop.
+if is_azure; then
+ # Skip the workaround if we don't own \EFI\Boot or the removable
+ # option is used
+ if test "$update_boot" = "yes" && test "$removable" = "no"; then
+ # Remove fallback.efi which could cause the reset loop in Azure
+ rm -f "${efibootdir}/fallback.efi"
+ # Remove the older grub binary and config
+ rm -f "${efibootdir}/grub.efi"
+ rm -f "${efibootdir}/grub.cfg"
+ # Install new grub binary and config file to \EFI\Boot as
+ # the "removable" option
+ cp "${efidir}/grub.cfg" "${efibootdir}/grub.cfg"
+ cp "${efidir}/grub.efi" "${efibootdir}/grub.efi"
+ fi
+fi
