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

Make legacy_source behave like source.

Browse source 
* grub-core/commands/legacycfg.c (legacy_file): Don't call
	grub_show_menu.
	(grub_cmd_legacy_source): Call grub_show_menu if needed.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-11-17 08:41:18 +01:00
parent 24ec575b72
commit f18088844f
2 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2010-11-16 Vladimir Serbinenko <phcoder@gmail.com>
Make legacy_source behave like source.
* grub-core/commands/legacycfg.c (legacy_file): Don't call
grub_show_menu.
(grub_cmd_legacy_source): Call grub_show_menu if needed.
2010-11-16 Colin Watson <cjwatson@debian.org> 2010-11-16 Colin Watson <cjwatson@debian.org>
* conf/Makefile.common (CFLAGS_GNULIB): Add -Wno-unused-parameter. * conf/Makefile.common (CFLAGS_GNULIB): Add -Wno-unused-parameter.

18
grub-core/commands/legacycfg.c
View file

@ -177,9 +177,6 @@ legacy_file (const char *filename)
grub_free (suffix); grub_free (suffix);
grub_free (entrysrc); grub_free (entrysrc);
if (menu && menu->size)
grub_show_menu (menu, 1);
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }
@ -194,8 +191,8 @@ grub_cmd_legacy_source (struct grub_command *cmd,
return grub_error (GRUB_ERR_BAD_ARGUMENT, "file name required"); return grub_error (GRUB_ERR_BAD_ARGUMENT, "file name required");
extractor = (cmd->name[0] == 'e'); extractor = (cmd->name[0] == 'e');
new_env = (cmd->name[extractor ? sizeof ("extract_legacy_entries_") - 1 new_env = (cmd->name[extractor ? (sizeof ("extract_legacy_entries_") - 1)
: sizeof ("legacy_") - 1] == 'c'); : (sizeof ("legacy_") - 1)] == 'c');
if (new_env) if (new_env)
grub_cls (); grub_cls ();
@ -207,8 +204,15 @@ grub_cmd_legacy_source (struct grub_command *cmd,
ret = legacy_file (args[0]); ret = legacy_file (args[0]);
if (new_env && !extractor) if (new_env)
grub_env_context_close (); {
grub_menu_t menu;
menu = grub_env_get_menu ();
if (menu && menu->size)
grub_show_menu (menu, 1);
if (!extractor)
grub_env_context_close ();
}
if (extractor) if (extractor)
grub_env_extractor_close (!new_env); grub_env_extractor_close (!new_env);