From 99bcf9931e0176e736e3e98c6a941121a3f53e82 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 5 Oct 2021 17:39:11 -0400 Subject: [PATCH] Fix grub-mkimage --append-signature-size 0179-Add-suport-for-signing-grub-with-an-appended-signatu.patch was written in Jun of 2020, before support for .sbat went upstream. It adds a command line option "--append-signature-size" to grub-mkimage with the short argument '-s'. Unfortunately, .sbat support also uses that short argument, and as a result, trying to use "grub-mkimage --append-signature-size" on ppc64le (where we need it) fails due to argument.sbat being set on a non-EFI platform. This patch makes the --append-signature-size use 'S' instead of 's'. Related: rhbz#1951104 Signed-off-by: Peter Jones --- ...Add-suport-for-signing-grub-with-an-appended-signatu.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/0179-Add-suport-for-signing-grub-with-an-appended-signatu.patch b/0179-Add-suport-for-signing-grub-with-an-appended-signatu.patch index a863298..8607551 100644 --- a/0179-Add-suport-for-signing-grub-with-an-appended-signatu.patch +++ b/0179-Add-suport-for-signing-grub-with-an-appended-signatu.patch @@ -106,14 +106,14 @@ index 4e212e690c5..aab2a941f85 100644 while (dc--) grub_install_pop_module (); diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c -index c0d55993702..26d1ecbf74e 100644 +index c0d55993702..94c9893230f 100644 --- a/util/grub-mkimage.c +++ b/util/grub-mkimage.c @@ -84,6 +84,7 @@ static struct argp_option options[] = { {"sbat", 's', N_("FILE"), 0, N_("SBAT metadata"), 0}, {"disable-shim-lock", GRUB_INSTALL_OPTIONS_DISABLE_SHIM_LOCK, 0, 0, N_("disable shim_lock verifier"), 0}, {"verbose", 'v', 0, 0, N_("print verbose messages."), 0}, -+ {"appended-signature-size", 's', N_("SIZE"), 0, N_("Add a note segment reserving SIZE bytes for an appended signature"), 0}, ++ {"appended-signature-size", 'S', N_("SIZE"), 0, N_("Add a note segment reserving SIZE bytes for an appended signature"), 0}, { 0, 0, 0, 0, 0, 0 } };