From 4562b72afc296be6d0a9fa16d8b0e5729d32cca0 Mon Sep 17 00:00:00 2001 From: Leo Sandoval Date: Tue, 12 Dec 2023 18:26:32 -0600 Subject: [PATCH] chainloader: remove device path debug message Signed-off-by: Leo Sandoval --- ...der-remove-device-path-debug-message.patch | 28 +++++++++++++++++++ grub.patches | 1 + grub2.spec | 5 +++- 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 0347-chainloader-remove-device-path-debug-message.patch diff --git a/0347-chainloader-remove-device-path-debug-message.patch b/0347-chainloader-remove-device-path-debug-message.patch new file mode 100644 index 0000000..ef7720f --- /dev/null +++ b/0347-chainloader-remove-device-path-debug-message.patch @@ -0,0 +1,28 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: raravind +Date: Tue, 9 May 2023 11:29:35 +0200 +Subject: [PATCH] chainloader: remove device path debug message + +Remove the debug message "/EndEntire" while using GRUB chainloader command. + +Signed-off-by: raravind +(cherry picked from commit f75f5386b7a6a7cb2e10d30f817a3564c0a28dd7) +--- + grub-core/loader/efi/chainloader.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c +index dd31ac9bb..b1c86dab2 100644 +--- a/grub-core/loader/efi/chainloader.c ++++ b/grub-core/loader/efi/chainloader.c +@@ -210,7 +210,6 @@ make_file_path (grub_efi_device_path_t *dp, const char *filename) + /* Fill the file path for the directory. */ + d = (grub_efi_device_path_t *) ((char *) file_path + + ((char *) d - (char *) dp)); +- grub_efi_print_device_path (d); + if (copy_file_path ((grub_efi_file_path_device_path_t *) d, + dir_start, dir_end - dir_start) != GRUB_ERR_NONE) + { +-- +2.43.0 + diff --git a/grub.patches b/grub.patches index 0ce0db2..76772d4 100644 --- a/grub.patches +++ b/grub.patches @@ -344,3 +344,4 @@ Patch0343: 0343-fs-xfs-Fix-issues-found-while-fuzzing-the-XFS-filesy.patch Patch0344: 0344-fs-xfs-Incorrect-short-form-directory-data-boundary-.patch Patch0345: 0345-fs-xfs-Fix-XFS-directory-extent-parsing.patch Patch0346: 0346-fs-xfs-Add-large-extent-counters-incompat-feature-su.patch +Patch0347: 0347-chainloader-remove-device-path-debug-message.patch \ No newline at end of file diff --git a/grub2.spec b/grub2.spec index 5509ccb..5979923 100644 --- a/grub2.spec +++ b/grub2.spec @@ -17,7 +17,7 @@ Name: grub2 Epoch: 1 Version: 2.06 -Release: 110%{?dist} +Release: 111%{?dist} Summary: Bootloader with support for Linux, Multiboot and more License: GPL-3.0-or-later URL: http://www.gnu.org/software/grub/ @@ -555,6 +555,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg %endif %changelog +* Tue Dec 12 2023 leo sandoval - 2.06-111 +- chainloader: remove device path debug message + * Fri Dec 1 2023 Nicolas Frayer - 2.06-110 - fs/xfs: Add several fixes/improvements to xfs fs from upstream - Resolves: #2247926