vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2007-03-05 Marco Gerards <marco@gnu.org>

Browse source 
* normal/main.c (read_config_file): When "menu" is not set, create
	an initial context.
This commit is contained in:
marco_g 2007-03-05 20:32:43 +00:00
parent 4a6cb94573
commit 3b801603d5
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> 2007-02-21 Hollis Blanchard <hollis@penguinppc.org>
* kern/powerpc/ieee1275/init.c (HEAP_SIZE): Removed. * kern/powerpc/ieee1275/init.c (HEAP_SIZE): Removed.

9
normal/main.c
View file

@ -217,7 +217,9 @@ read_config_file (const char *config, int nested)
grub_menu_t newmenu; grub_menu_t newmenu;
if (nested) newmenu = grub_env_get_data_slot ("menu");
if (nested || ! newmenu)
{ {
newmenu = grub_malloc (sizeof (*newmenu)); newmenu = grub_malloc (sizeof (*newmenu));
if (! newmenu) if (! newmenu)
@ -231,10 +233,7 @@ read_config_file (const char *config, int nested)
if (! file) if (! file)
return 0; return 0;
if (nested) grub_env_set_data_slot ("menu", newmenu);
grub_env_set_data_slot ("menu", newmenu);
else
newmenu = grub_env_get_data_slot ("menu");
while (1) while (1)
{ {