2007-03-05 Marco Gerards <marco@gnu.org>
* normal/main.c (read_config_file): When "menu" is not set, create an initial context.
This commit is contained in:
parent
4a6cb94573
commit
3b801603d5
2 changed files with 9 additions and 5 deletions
|
@ -1,3 +1,8 @@
|
|||
2007-03-05 Marco Gerards <marco@gnu.org>
|
||||
|
||||
* normal/main.c (read_config_file): When "menu" is not set, create
|
||||
an initial context.
|
||||
|
||||
2007-02-21 Hollis Blanchard <hollis@penguinppc.org>
|
||||
|
||||
* kern/powerpc/ieee1275/init.c (HEAP_SIZE): Removed.
|
||||
|
|
|
@ -217,7 +217,9 @@ read_config_file (const char *config, int nested)
|
|||
|
||||
grub_menu_t newmenu;
|
||||
|
||||
if (nested)
|
||||
newmenu = grub_env_get_data_slot ("menu");
|
||||
|
||||
if (nested || ! newmenu)
|
||||
{
|
||||
newmenu = grub_malloc (sizeof (*newmenu));
|
||||
if (! newmenu)
|
||||
|
@ -231,10 +233,7 @@ read_config_file (const char *config, int nested)
|
|||
if (! file)
|
||||
return 0;
|
||||
|
||||
if (nested)
|
||||
grub_env_set_data_slot ("menu", newmenu);
|
||||
else
|
||||
newmenu = grub_env_get_data_slot ("menu");
|
||||
|
||||
while (1)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue