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

merge menuentry.mod into normal.mod

Browse source
This commit is contained in:
BVK Chaitanya 2010-09-03 21:08:12 +05:30
parent 78780e7005
commit 9284756e17
4 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
grub-core/Makefile.core.def
View file

@ -1173,6 +1173,8 @@ module = {
common = script/lexer.c; common = script/lexer.c;
common = script/argv.c; common = script/argv.c;
common = commands/menuentry.c;
common = unidata.c; common = unidata.c;
common_nodist = grub_script.tab.c; common_nodist = grub_script.tab.c;
common_nodist = grub_script.yy.c; common_nodist = grub_script.yy.c;
@ -1408,8 +1410,3 @@ module = {
name = test_blockarg; name = test_blockarg;
common = tests/test_blockarg.c; common = tests/test_blockarg.c;
}; };
module = {
name = menuentry;
common = commands/menuentry.c;
};

6
grub-core/commands/menuentry.c
View file

@ -200,14 +200,16 @@ grub_cmd_menuentry (grub_extcmd_context_t ctxt, int argc, char **args)
static grub_extcmd_t cmd; static grub_extcmd_t cmd;
GRUB_MOD_INIT(menuentry) void
grub_menu_init (void)
{ {
cmd = grub_register_extcmd ("menuentry", grub_cmd_menuentry, cmd = grub_register_extcmd ("menuentry", grub_cmd_menuentry,
GRUB_COMMAND_FLAG_BOTH | GRUB_COMMAND_FLAG_BLOCKS, GRUB_COMMAND_FLAG_BOTH | GRUB_COMMAND_FLAG_BLOCKS,
N_("BLOCK"), N_("Define a menuentry."), options); N_("BLOCK"), N_("Define a menuentry."), options);
} }
GRUB_MOD_FINI(menuentry) void
grub_menu_fini (void)
{ {
grub_unregister_extcmd (cmd); grub_unregister_extcmd (cmd);
} }

2
grub-core/normal/main.c
View file

@ -476,6 +476,7 @@ GRUB_MOD_INIT(normal)
{ {
grub_context_init (); grub_context_init ();
grub_script_init (); grub_script_init ();
grub_menu_init ();
grub_xputs_saved = grub_xputs; grub_xputs_saved = grub_xputs;
grub_xputs = grub_xputs_normal; grub_xputs = grub_xputs_normal;
@ -515,6 +516,7 @@ GRUB_MOD_FINI(normal)
{ {
grub_context_fini (); grub_context_fini ();
grub_script_fini (); grub_script_fini ();
grub_menu_fini ();
grub_xputs = grub_xputs_saved; grub_xputs = grub_xputs_saved;

3
include/grub/menu.h
View file

@ -100,4 +100,7 @@ void grub_menu_execute_with_fallback (grub_menu_t menu,
void grub_menu_entry_run (grub_menu_entry_t entry); void grub_menu_entry_run (grub_menu_entry_t entry);
int grub_menu_get_default_entry_index (grub_menu_t menu); int grub_menu_get_default_entry_index (grub_menu_t menu);
void grub_menu_init (void);
void grub_menu_fini (void);
#endif /* GRUB_MENU_HEADER */ #endif /* GRUB_MENU_HEADER */