Accepting request 822330 from devel:openSUSE:Factory

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

shim-install

@@ -146,7 +146,17 @@ do
 	no_nvram=yes ;;
 
     --suse-enable-tpm)
-        source_grub_efi="/usr/lib/grub2/${grub_install_target}/grub-tpm.efi" ;;
+        # bsc#1174320 shim-install uses wrong paths for EFI files
+        # There are 3 possible locations of grub-tpm.efi and we will check them
+        # one by one.
+        if [ -e "${source_dir}/grub-tpm.efi" ]; then
+            source_grub_efi="${source_dir}/grub-tpm.efi"
+	elif [ -e "${datadir}/grub2/${grub_install_target}/grub-tpm.efi" ] ; then
+            source_grub_efi="${datadir}/grub2/${grub_install_target}/grub-tpm.efi"
+        else
+            source_grub_efi="/usr/lib/grub2/${grub_install_target}/grub-tpm.efi"
+        fi
+       	;;
 
     --clean)
 	clean=yes ;;

shim.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jul 22 09:23:02 UTC 2020 - Gary Ching-Pang Lin <glin@suse.com>
+
+- Update the path to grub-tpm.efi in shim-install (bsc#1174320)
+
 -------------------------------------------------------------------
 Fri Jul 10 06:28:44 UTC 2020 - Gary Ching-Pang Lin <glin@suse.com>