mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-10-18 09:51:50 +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>
45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Will Thompson <wjt@endlessm.com>
|
|
Date: Wed, 11 Jul 2018 15:01:45 +0100
|
|
Subject: [PATCH] blscfg: don't dynamically allocate default_blsdir
|
|
|
|
Signed-off-by: Will Thompson <wjt@endlessm.com>
|
|
---
|
|
grub-core/commands/blscfg.c | 9 +++------
|
|
1 file changed, 3 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
|
|
index 82fb6cdd182..b61dddb7f43 100644
|
|
--- a/grub-core/commands/blscfg.c
|
|
+++ b/grub-core/commands/blscfg.c
|
|
@@ -623,7 +623,7 @@ static int find_entry (const char *filename,
|
|
grub_file_t f = NULL;
|
|
char *grubenv_path = NULL;
|
|
grub_envblk_t env = NULL;
|
|
- char *default_blsdir = NULL;
|
|
+ const char *default_blsdir = NULL;
|
|
grub_fs_t blsdir_fs = NULL;
|
|
grub_device_t blsdir_dev = NULL;
|
|
const char *blsdir = NULL;
|
|
@@ -643,10 +643,9 @@ static int find_entry (const char *filename,
|
|
|
|
// set a default blsdir
|
|
if (info->platform == PLATFORM_EMU)
|
|
- default_blsdir = grub_xasprintf ("%s%s", GRUB_BOOT_DEVICE,
|
|
- GRUB_BLS_CONFIG_PATH);
|
|
+ default_blsdir = GRUB_BOOT_DEVICE GRUB_BLS_CONFIG_PATH;
|
|
else
|
|
- default_blsdir = grub_xasprintf ("%s", GRUB_BLS_CONFIG_PATH);
|
|
+ default_blsdir = GRUB_BLS_CONFIG_PATH;
|
|
|
|
grub_env_set ("blsdir", default_blsdir);
|
|
grub_dprintf ("blscfg", "default_blsdir: \"%s\"\n", default_blsdir);
|
|
@@ -788,8 +787,6 @@ finish:
|
|
if (f)
|
|
grub_file_close (f);
|
|
|
|
- grub_free (default_blsdir);
|
|
-
|
|
return 0;
|
|
}
|
|
|