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

Basic menuentry-retrieveing jail

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-09-16 23:48:32 +02:00
parent cb731b5e81
commit 7756d44436
11 changed files with 115 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

35
grub-core/commands/configfile.c
View file

@ -27,28 +27,34 @@
static grub_err_t
grub_cmd_source (grub_command_t cmd, int argc, char **args)
{
int new_env;
int new_env, jail;
if (argc != 1)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "file name required");
new_env = (cmd->name[0] == 'c');
jail = (cmd->name[0] == 'j');
new_env = (cmd->name[jail ? 5 : 0] == 'c');
if (new_env)
{
grub_cls ();
grub_env_context_open (1);
}
grub_cls ();
if (new_env && !jail)
grub_env_context_open ();
if (jail)
grub_env_jail_open (!new_env);
grub_normal_execute (args[0], 1, ! new_env);
if (new_env)
if (new_env && !jail)
grub_env_context_close ();
if (jail)
grub_env_jail_close (!new_env);
return 0;
}
static grub_command_t cmd_configfile, cmd_source, cmd_dot;
static grub_command_t cmd_jail_source, cmd_jail_configfile;
GRUB_MOD_INIT(configfile)
{
@ -60,6 +66,19 @@ GRUB_MOD_INIT(configfile)
N_("FILE"),
N_("Load another config file without changing context.")
);
cmd_jail_source =
grub_register_command ("jail_source", grub_cmd_source,
N_("FILE"),
N_("Load another config file without changing context but take only menuentries.")
);
cmd_jail_configfile =
grub_register_command ("jail_configfile", grub_cmd_source,
N_("FILE"),
N_("Load another config file without changing context but take only menuentries.")
);
cmd_dot =
grub_register_command (".", grub_cmd_source,
N_("FILE"),
@ -71,5 +90,7 @@ GRUB_MOD_FINI(configfile)
{
grub_unregister_command (cmd_configfile);
grub_unregister_command (cmd_source);
grub_unregister_command (cmd_jail_configfile);
grub_unregister_command (cmd_jail_source);
grub_unregister_command (cmd_dot);
}

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

@ -274,7 +274,8 @@ void
grub_menu_init (void)
{
cmd = grub_register_extcmd ("menuentry", grub_cmd_menuentry,
GRUB_COMMAND_FLAG_BLOCKS,
GRUB_COMMAND_FLAG_BLOCKS
| GRUB_COMMAND_FLAG_UNJAILED,
N_("BLOCK"), N_("Define a menuentry."), options);
}

2
grub-core/commands/search_wrap.c
View file

@ -90,7 +90,7 @@ static grub_extcmd_t cmd;
GRUB_MOD_INIT(search)
{
cmd =
grub_register_extcmd ("search", grub_cmd_search, 0,
grub_register_extcmd ("search", grub_cmd_search, GRUB_COMMAND_FLAG_UNJAILED,
N_("[-f|-l|-u|-s|-n] [--hint HINT [--hint HINT] ...]"
" NAME"),
N_("Search devices by file, filesystem label"

2
grub-core/commands/test.c
View file

@ -423,8 +423,10 @@ GRUB_MOD_INIT(test)
{
cmd_1 = grub_register_command ("[", grub_cmd_test,
N_("EXPRESSION ]"), N_("Evaluate an expression."));
cmd_1->flags |= GRUB_COMMAND_FLAG_UNJAILED;
cmd_2 = grub_register_command ("test", grub_cmd_test,
N_("EXPRESSION"), N_("Evaluate an expression."));
cmd_2->flags |= GRUB_COMMAND_FLAG_UNJAILED;
}
GRUB_MOD_FINI(test)