From fd7b355f25dbdae31bf3d82ffc2e8f9ec4a6acee Mon Sep 17 00:00:00 2001
From: Steve McIntyre <93sam@debian.org>
Date: Sun, 23 Apr 2023 21:14:54 +0100
Subject: [PATCH 1/1] Installing to the RMP also needs mokmanager.

Closes: #1034409
---
 debian/changelog                                 | 9 +++++++++
 debian/patches/grub-install-removable-shim.patch | 3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a28558749..7298ba3aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+grub2 (2.06-13) UNRELEASED; urgency=medium
+
+  [ Steve McIntyre ]
+  * When *also* installing to the removable media path, include the
+    relevant mokmanager binary. Closes: #1034409
+
+
+ -- Steve McIntyre <93sam@debian.org>  Sun, 23 Apr 2023 20:55:54 +0100
+
 grub2 (2.06-12) unstable; urgency=medium
 
   * Fix up arm64 SB patch to fix build failure on 32-bit arm systems
diff --git a/debian/patches/grub-install-removable-shim.patch b/debian/patches/grub-install-removable-shim.patch
index 53c28d698..21b87c446 100644
--- a/debian/patches/grub-install-removable-shim.patch
+++ b/debian/patches/grub-install-removable-shim.patch
@@ -107,7 +107,7 @@ Index: grub.git/util/grub-install.c
  
  		fb_src = grub_util_path_concat (2, "/usr/lib/shim/",
  						    fb_signed);
-@@ -2154,30 +2152,81 @@ main (int argc, char *argv[])
+@@ -2154,30 +2152,82 @@ main (int argc, char *argv[])
  		if (!removable)
  		  grub_install_copy_file (fb_src,
  					  fb_dst, 0);
@@ -129,6 +129,7 @@ Index: grub.git/util/grub-install.c
 +		    also_install_removable (shim_signed, base_efidir, removable_file, 1);
 +
 +		    also_install_removable (efi_signed, base_efidir, chained_base, 1);
++		    also_install_removable (mok_src, base_efidir, mok_file, 0);
 +
 +		    /* If we're updating the NVRAM, add fallback too - it
 +			will re-update the NVRAM later if things break */
-- 
2.39.2