mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-28 07:44:52 +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>
47 lines
1.3 KiB
Diff
47 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Fri, 28 Sep 2018 15:42:19 -0400
|
|
Subject: [PATCH] Fix getroot.c's trampolines.
|
|
|
|
This makes the stack executable on most of the grub utilities, which is
|
|
bad, and rpmdiff complains about it.
|
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
---
|
|
grub-core/osdep/linux/getroot.c | 16 +++++++---------
|
|
1 file changed, 7 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
|
|
index 2b7a626d5ea..36429a7cd25 100644
|
|
--- a/grub-core/osdep/linux/getroot.c
|
|
+++ b/grub-core/osdep/linux/getroot.c
|
|
@@ -1264,22 +1264,20 @@ grub_util_get_grub_dev_os (const char *os_dev)
|
|
return grub_dev;
|
|
}
|
|
|
|
+static void *mp = NULL;
|
|
+static void
|
|
+btrfs_mount_path_hook(const char *m)
|
|
+{
|
|
+ mp = strdup (m);
|
|
+}
|
|
|
|
char *
|
|
grub_util_get_btrfs_subvol (const char *path, char **mount_path)
|
|
{
|
|
- char *mp = NULL;
|
|
-
|
|
if (mount_path)
|
|
*mount_path = NULL;
|
|
|
|
- auto void
|
|
- mount_path_hook (const char *m)
|
|
- {
|
|
- mp = strdup (m);
|
|
- }
|
|
-
|
|
- grub_find_root_btrfs_mount_path_hook = mount_path_hook;
|
|
+ grub_find_root_btrfs_mount_path_hook = btrfs_mount_path_hook;
|
|
grub_free (grub_find_root_devices_from_mountinfo (path, NULL));
|
|
grub_find_root_btrfs_mount_path_hook = NULL;
|
|
|