mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-24 14:32:58 +00:00
1f092caba7
Add comments and revert logic changes in 01_fallback_counting Remove quotes when reading ID value from /etc/os-release Related: rhbz#1650706 blscfg: expand grub_users before passing to grub_normal_add_menu_entry() Resolves: rhbz#1650706 Drop buggy downstream patch "efinet: retransmit if our device is busy" Resolves: rhbz#1649048 Make the menu entry users option argument to be optional Related: rhbz#1652434 10_linux_bls: add missing menu entries options Resolves: rhbz#1652434 Drop "Be more aggro about actually using the *configured* network device." Resolves: rhbz#1654388 Fix menu entry selection based on title Resolves: rhbz#1654936 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Mon, 1 May 2017 11:19:40 -0400
|
|
Subject: [PATCH] print more debug info in our module loader.
|
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
---
|
|
grub-core/kern/efi/efi.c | 16 +++++++++++++---
|
|
1 file changed, 13 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
|
|
index e339f264b3a..562d6887e0e 100644
|
|
--- a/grub-core/kern/efi/efi.c
|
|
+++ b/grub-core/kern/efi/efi.c
|
|
@@ -313,13 +313,23 @@ grub_efi_modules_addr (void)
|
|
}
|
|
|
|
if (i == coff_header->num_sections)
|
|
- return 0;
|
|
+ {
|
|
+ grub_dprintf("sections", "section %d is last section; invalid.\n", i);
|
|
+ return 0;
|
|
+ }
|
|
|
|
info = (struct grub_module_info *) ((char *) image->image_base
|
|
+ section->virtual_address);
|
|
- if (info->magic != GRUB_MODULE_MAGIC)
|
|
- return 0;
|
|
+ if (section->name[0] != '.' && info->magic != GRUB_MODULE_MAGIC)
|
|
+ {
|
|
+ grub_dprintf("sections",
|
|
+ "section %d has bad magic %08x, should be %08x\n",
|
|
+ i, info->magic, GRUB_MODULE_MAGIC);
|
|
+ return 0;
|
|
+ }
|
|
|
|
+ grub_dprintf("sections", "returning section info for section %d: \"%s\"\n",
|
|
+ i, section->name);
|
|
return (grub_addr_t) info;
|
|
}
|
|
|