|
 |
6b2dd0f |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
f4c76c0 |
From: Peter Jones <pjones@redhat.com>
|
|
 |
e153146 |
Date: Mon, 8 Jul 2019 17:33:22 +0200
|
|
|
752ceb1 |
Subject: [PATCH] Try mac/guid/etc before grub.cfg on tftp config files.
|
|
|
f4c76c0 |
|
|
|
f4c76c0 |
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
f4c76c0 |
---
|
|
|
e153146 |
grub-core/normal/main.c | 84 ++++++++++++++++++++++++++-----------------------
|
|
|
e153146 |
1 file changed, 45 insertions(+), 39 deletions(-)
|
|
|
f4c76c0 |
|
|
|
f4c76c0 |
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
|
|
|
e153146 |
index 8add30e605f..d93bee613ac 100644
|
|
|
f4c76c0 |
--- a/grub-core/normal/main.c
|
|
|
f4c76c0 |
+++ b/grub-core/normal/main.c
|
|
|
7e98da0 |
@@ -347,53 +347,59 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
|
|
|
f4c76c0 |
/* Guess the config filename. It is necessary to make CONFIG static,
|
|
|
f4c76c0 |
so that it won't get broken by longjmp. */
|
|
|
f4c76c0 |
char *config;
|
|
|
f4c76c0 |
- const char *prefix, *fw_path;
|
|
|
f4c76c0 |
-
|
|
|
f4c76c0 |
- prefix = fw_path = grub_env_get ("fw_path");
|
|
|
f4c76c0 |
- if (fw_path)
|
|
|
f4c76c0 |
- {
|
|
|
f4c76c0 |
- config = grub_xasprintf ("%s/grub.cfg", fw_path);
|
|
|
f4c76c0 |
- if (config)
|
|
|
f4c76c0 |
- {
|
|
|
f4c76c0 |
- grub_file_t file;
|
|
|
f4c76c0 |
-
|
|
|
e153146 |
- file = grub_file_open (config, GRUB_FILE_TYPE_CONFIG);
|
|
|
f4c76c0 |
- if (file)
|
|
|
f4c76c0 |
- {
|
|
|
f4c76c0 |
- grub_file_close (file);
|
|
|
f4c76c0 |
- grub_enter_normal_mode (config);
|
|
|
f4c76c0 |
- }
|
|
|
f4c76c0 |
- else
|
|
|
f4c76c0 |
- {
|
|
|
f4c76c0 |
- /* Ignore all errors. */
|
|
|
f4c76c0 |
- grub_errno = 0;
|
|
|
f4c76c0 |
- }
|
|
|
f4c76c0 |
- grub_free (config);
|
|
|
f4c76c0 |
- }
|
|
|
f4c76c0 |
- }
|
|
|
f4c76c0 |
+ const char *prefix;
|
|
|
f4c76c0 |
|
|
|
f4c76c0 |
+ prefix = grub_env_get ("fw_path");
|
|
|
f4c76c0 |
if (! prefix)
|
|
|
f4c76c0 |
prefix = grub_env_get ("prefix");
|
|
|
f4c76c0 |
+
|
|
|
f4c76c0 |
if (prefix)
|
|
|
e153146 |
{
|
|
|
f4c76c0 |
- grub_size_t config_len;
|
|
|
f4c76c0 |
- config_len = grub_strlen (prefix) +
|
|
|
f4c76c0 |
- sizeof ("/grub.cfg-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX");
|
|
|
f4c76c0 |
- config = grub_malloc (config_len);
|
|
|
e153146 |
-
|
|
|
f4c76c0 |
- if (! config)
|
|
|
f4c76c0 |
- goto quit;
|
|
|
e153146 |
-
|
|
|
f4c76c0 |
- grub_snprintf (config, config_len, "%s/grub.cfg", prefix);
|
|
|
e153146 |
-
|
|
|
e153146 |
if (grub_strncmp (prefix + 1, "tftp", sizeof ("tftp") - 1) == 0)
|
|
|
f4c76c0 |
- grub_net_search_configfile (config);
|
|
|
e153146 |
+ {
|
|
|
e153146 |
+ grub_size_t config_len;
|
|
|
e153146 |
+ config_len = grub_strlen (prefix) +
|
|
|
e153146 |
+ sizeof ("/grub.cfg-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX");
|
|
|
e153146 |
+ config = grub_malloc (config_len);
|
|
|
ec4acbb |
|
|
|
ec4acbb |
- grub_enter_normal_mode (config);
|
|
|
ec4acbb |
- grub_free (config);
|
|
|
e153146 |
- }
|
|
|
e153146 |
+ if (! config)
|
|
|
e153146 |
+ goto quit;
|
|
|
e153146 |
+
|
|
|
e153146 |
+ grub_snprintf (config, config_len, "%s/grub.cfg", prefix);
|
|
|
e153146 |
+
|
|
|
e153146 |
+ grub_net_search_configfile (config);
|
|
|
e153146 |
+
|
|
|
e153146 |
+ grub_enter_normal_mode (config);
|
|
|
e153146 |
+ grub_free (config);
|
|
|
e153146 |
+ config = NULL;
|
|
|
e153146 |
+ }
|
|
|
ec4acbb |
+
|
|
|
e153146 |
+ if (!config)
|
|
|
e153146 |
+ {
|
|
|
e153146 |
+ config = grub_xasprintf ("%s/grub.cfg", prefix);
|
|
|
e153146 |
+ if (config)
|
|
|
e153146 |
+ {
|
|
|
e153146 |
+ grub_file_t file;
|
|
|
f4c76c0 |
+
|
|
|
e153146 |
+ file = grub_file_open (config, GRUB_FILE_TYPE_CONFIG);
|
|
|
e153146 |
+ if (file)
|
|
|
e153146 |
+ {
|
|
|
e153146 |
+ grub_file_close (file);
|
|
|
e153146 |
+ grub_enter_normal_mode (config);
|
|
|
e153146 |
+ }
|
|
|
e153146 |
+ else
|
|
|
e153146 |
+ {
|
|
|
e153146 |
+ /* Ignore all errors. */
|
|
|
e153146 |
+ grub_errno = 0;
|
|
|
e153146 |
+ }
|
|
|
e153146 |
+ grub_free (config);
|
|
|
e153146 |
+ }
|
|
|
e153146 |
+ }
|
|
|
e153146 |
+ }
|
|
|
f4c76c0 |
else
|
|
|
f4c76c0 |
- grub_enter_normal_mode (0);
|
|
|
e153146 |
+ {
|
|
|
e153146 |
+ grub_enter_normal_mode (0);
|
|
|
e153146 |
+ }
|
|
|
f4c76c0 |
}
|
|
|
f4c76c0 |
else
|
|
|
f4c76c0 |
grub_enter_normal_mode (argv[0]);
|