grub-install: Don't use our grub CD EFI image for --removable

Closes: #1026915. Thanks to Pascal Hambourg for the patch.

diff --git a/debian/changelog b/debian/changelog
index 79b83d8b84d949df870cd7b8547a665fc584b6da..9f67cfd50aa36397b8a568cabbe12b3b67bc05c6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ grub2 (2.06-8) UNRELEASED; urgency=medium
     Fixes #845683
   * grub-install: Don't install the shim fallback program when called
     with --removable. Closes: #1016737
+  * grub-install: Don't use our grub CD EFI image for --removable.
+    Closes: #1026915. Thanks to Pascal Hambourg for the patch.
 
  -- Steve McIntyre <93sam@debian.org>  Thu, 29 Dec 2022 13:36:22 +0000
 

diff --git a/debian/patches/install-signed.patch b/debian/patches/install-signed.patch
index 847606ee77fabf7d13210553b60f914008d07cd2..62f315f930ef33d7e70c4ce3321234e704acf309 100644 (file)
--- a/debian/patches/install-signed.patch
+++ b/debian/patches/install-signed.patch
@@ -192,7 +192,7 @@ Index: grub.git/util/grub-install.c
        }
        t = grub_util_path_concat (3, efidir, "EFI", efi_distributor);
        free (efidir);
-@@ -1375,14 +1378,41 @@ main (int argc, char *argv[])
+@@ -1375,14 +1378,38 @@ main (int argc, char *argv[])
        }
      }
  
@@ -208,10 +208,7 @@ Index: grub.git/util/grub-install.c
 +      {
 +      char *dir = xasprintf ("%s-signed", grub_install_source_directory);
 +      char *signed_image;
-+      if (removable)
-+        signed_image = xasprintf ("gcd%s.efi.signed", efi_suffix);
-+      else
-+        signed_image = xasprintf ("grub%s.efi.signed", efi_suffix);
++      signed_image = xasprintf ("grub%s.efi.signed", efi_suffix);
 +      efi_signed = grub_util_path_concat (2, dir, signed_image);
 +      break;
 +      }