From 060fa2cf6554ef5592e1e39d0ee884243852387f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20B=C4=9Blka?= <jiri.belka@suse.com>
Date: Fri, 10 Jul 2026 13:19:35 +0200
Subject: [PATCH] switch to r/w if /boot/efi is r/o

---
 grub2-efi/install |  3 +++
 include/library   | 27 +++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/grub2-efi/install b/grub2-efi/install
index 09014600..a8d824f3 100755
--- a/grub2-efi/install
+++ b/grub2-efi/install
@@ -124,6 +124,8 @@ if [ "$SYS__BOOTLOADER__UPDATE_NVRAM" = "no" ] ; then
   append="$append --no-nvram"
 fi
 
+lib_switch_efi_mount_dir_ro_rw pre
+
 if [ "$SYS__BOOTLOADER__SECURE_BOOT" = "yes" -a -x /usr/sbin/shim-install ] ; then
   ( set -x ; /usr/sbin/shim-install --config-file=/boot/grub2/grub.cfg $append )
 elif [ -x /usr/sbin/grub2-install ] ; then
@@ -151,6 +153,7 @@ else
   exit 1
 fi
 
+lib_switch_efi_mount_dir_ro_rw post
 err=$?
 
 lib_efi_log_boot_entry
diff --git a/include/library b/include/library
index d039e3a0..1a15c555 100644
--- a/include/library
+++ b/include/library
@@ -405,3 +405,30 @@ lib_get_default_kernel_initrd ()
     return
   done
 }
+
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# lib_switch_efi_mount_dir_ro_rw
+#
+# Switch $efi_mount_dir filesystem ro/rw modes
+#
+lib_switch_efi_mount_dir_ro_rw ()
+{
+  local action=$1
+
+  lib_get_efi_mount_dir
+
+  case "$action" in
+    pre)
+      if findmnt -no OPTIONS "$efi_mount_dir" | tr ',' '\n' | grep -q '^ro$' ; then
+        mount -o remount,rw "$efi_mount_dir"
+      fi
+      ;;
+    post)
+      mode=$(awk -v efi_mount_dir="$efi_mount_dir" \
+        '$2 == efi_mount_dir { print $4 }' /etc/fstab | tr ',' '\n' | grep '^ro')
+      if [ -n "$mode" ]; then
+        mount -o remount,"$mode" "$efi_mount_dir"
+      fi
+      ;;
+  esac
+}