From 8695bfa3538b24635c77242669cb35a70603e599 Mon Sep 17 00:00:00 2001
From: Javier Martinez Canillas <javierm@redhat.com>
Date: Thu, 26 Mar 2020 15:08:30 +0100
Subject: [PATCH 200/220] grub-switch-to-blscfg: Update grub2 binary in ESP for
 OSTree systems

The grub2 EFI binary in the ESP isn't updated as a part of an OSTree update
transaction. So let's make the script to update this and also create a file
to indicate that the installed version has support for the blscfg module.

Related: rhbz#1751272

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
---
 util/grub-switch-to-blscfg.in | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/util/grub-switch-to-blscfg.in b/util/grub-switch-to-blscfg.in
index 49b3985..a05a8d9 100644
--- a/util/grub-switch-to-blscfg.in
+++ b/util/grub-switch-to-blscfg.in
@@ -266,6 +266,15 @@ copy_bls() {
     fi
 }
 
+# The grub2 EFI binary is not copied to the ESP as a part of an ostree
+# transaction. Make sure a grub2 version with BLS support is installed.
+if test -f /run/ostree-booted && test -d /sys/firmware/efi/efivars/; then
+    grub_binary="$(find /usr/lib/ostree-boot/efi/EFI/${EFIDIR}/ -name grub*.efi)"
+    cp ${grub_binary} ${grubdir} || exit 1
+    # Create a hidden file to indicate that grub2 now has BLS support.
+    touch /boot/grub2/.grub2-blscfg-supported
+fi
+
 GENERATE=0
 if grep '^GRUB_ENABLE_BLSCFG=.*' "${etcdefaultgrub}" \
         | grep -vq '^GRUB_ENABLE_BLSCFG="*true"*\s*$' ; then
-- 
1.8.3.1