Accepting request 1007166 from devel:openSUSE:Factory

OBS-URL: https://build.opensuse.org/request/show/1007166
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/shim?expand=0&rev=105

shim-install

@@ -386,13 +386,15 @@ EOF
 
 }
 
-make_grubcfg > "${efidir}/grub.cfg"
 # bnc#889765 GRUB shows broken letters at boot
 # invoke grub_install to initialize /boot/grub2 directory with files needed by grub.cfg
 # bsc#1118363 shim-install didn't specify the target for grub2-install
 # set the target explicitly for some special cases 
 ${grub_install} --target=${grub_install_target} --no-nvram
 
+# Making sure grub.cfg not overwritten by grub-install above 
+make_grubcfg > "${efidir}/grub.cfg"
+
 if test "$no_nvram" = no && test -n "$bootloader_id"; then
 
     modprobe -q efivars 2>/dev/null || true

shim.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Sep 29 02:42:35 UTC 2022 - Michael Chang <mchang@suse.com>
+
+- shim-install: ensure grub.cfg created is not overwritten after
+  installing grub related files
+
 -------------------------------------------------------------------
 Mon Sep 12 12:30:54 UTC 2022 - Kilian Hanich <khanich.opensource@gmx.de>