proxmox-mirrors/grub2
1
0
Fork 0
mirror of https://git.proxmox.com/git/grub2 synced 2025-08-17 01:40:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Closes: #1026915. Thanks to Pascal Hambourg for the patch.
This commit is contained in:
Steve McIntyre 2023-01-15 23:52:26 +00:00
parent d6be13a9e7
commit 36f78fd054
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -15,6 +15,8 @@ grub2 (2.06-8) UNRELEASED; urgency=medium
Fixes #845683 Fixes #845683
* grub-install: Don't install the shim fallback program when called * grub-install: Don't install the shim fallback program when called
with --removable. Closes: #1016737 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 -- Steve McIntyre <93sam@debian.org> Thu, 29 Dec 2022 13:36:22 +0000

5
debian/patches/install-signed.patch vendored
View File

@ -192,7 +192,7 @@ Index: grub.git/util/grub-install.c
} }
t = grub_util_path_concat (3, efidir, "EFI", efi_distributor); t = grub_util_path_concat (3, efidir, "EFI", efi_distributor);
free (efidir); free (efidir);
@@ -1375,14 +1378,41 @@ main (int argc, char *argv[]) @@ -1375,14 +1378,38 @@ main (int argc, char *argv[])
} }
} }
@ -208,9 +208,6 @@ Index: grub.git/util/grub-install.c
+ { + {
+ char *dir = xasprintf ("%s-signed", grub_install_source_directory); + char *dir = xasprintf ("%s-signed", grub_install_source_directory);
+ char *signed_image; + 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); + efi_signed = grub_util_path_concat (2, dir, signed_image);
+ break; + break;