From 82812e4ade82c9aa4f2e8f091b60b714ecfd82e5 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 6 Mar 2014 11:51:33 -0500 Subject: [PATCH 066/123] Try mac/guid/etc before grub.cfg on tftp config files. Signed-off-by: Peter Jones --- grub-core/normal/main.c | 80 ++++++++++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 37 deletions(-) diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c index a3713efcd..7d9c4f09b 100644 --- a/grub-core/normal/main.c +++ b/grub-core/normal/main.c @@ -341,53 +341,59 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)), /* Guess the config filename. It is necessary to make CONFIG static, so that it won't get broken by longjmp. */ char *config; - const char *prefix, *fw_path; - - prefix = fw_path = grub_env_get ("fw_path"); - if (fw_path) - { - config = grub_xasprintf ("%s/grub.cfg", fw_path); - if (config) - { - grub_file_t file; - - file = grub_file_open (config); - if (file) - { - grub_file_close (file); - grub_enter_normal_mode (config); - } - else - { - /* Ignore all errors. */ - grub_errno = 0; - } - grub_free (config); - } - } + const char *prefix; + prefix = grub_env_get ("fw_path"); if (! prefix) prefix = grub_env_get ("prefix"); + if (prefix) - { - grub_size_t config_len; - config_len = grub_strlen (prefix) + - sizeof ("/grub.cfg-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX"); - config = grub_malloc (config_len); + { + if (grub_strncmp (prefix + 1, "tftp", sizeof ("tftp") - 1) == 0) + { + grub_size_t config_len; + config_len = grub_strlen (prefix) + + sizeof ("/grub.cfg-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX"); + config = grub_malloc (config_len); + + if (! config) + goto quit; - if (! config) - goto quit; + grub_snprintf (config, config_len, "%s/grub.cfg", prefix); - grub_snprintf (config, config_len, "%s/grub.cfg", prefix); + grub_net_search_configfile (config); - if (grub_strncmp (prefix + 1, "tftp", sizeof ("tftp") - 1) == 0) - grub_net_search_configfile (config); + grub_enter_normal_mode (config); + grub_free (config); + config = NULL; + } - grub_enter_normal_mode (config); - grub_free (config); + if (!config) + { + config = grub_xasprintf ("%s/grub.cfg", prefix); + if (config) + { + grub_file_t file; + + file = grub_file_open (config); + if (file) + { + grub_file_close (file); + grub_enter_normal_mode (config); + } + else + { + /* Ignore all errors. */ + grub_errno = 0; + } + grub_free (config); + } + } } else - grub_enter_normal_mode (0); + { + grub_enter_normal_mode (0); + } } else grub_enter_normal_mode (argv[0]); -- 2.14.3