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

2006-04-30 Marco Gerards <marco@gnu.org>

Browse source 
* commands/configfile.c (grub_cmd_source): New function.
	(GRUB_MOD_INIT): Register the commands `source' and `.'.
	(GRUB_MOD_FINI): De-register the commands `source' and `.'.
This commit is contained in:
marco_g 2006-04-30 20:48:05 +00:00
parent df5341da9e
commit c0111d6e92
2 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2006-04-30 Marco Gerards <marco@gnu.org>
* commands/configfile.c (grub_cmd_source): New function.
(GRUB_MOD_INIT): Register the commands `source' and `.'.
(GRUB_MOD_FINI): De-register the commands `source' and `.'.
2006-04-30 Marco Gerards <marco@gnu.org> 2006-04-30 Marco Gerards <marco@gnu.org>
* normal/execute.c (grub_script_execute_cmd): Change the return * normal/execute.c (grub_script_execute_cmd): Change the return

23
commands/configfile.c
View file

@ -40,6 +40,19 @@ grub_cmd_configfile (struct grub_arg_list *state __attribute__ ((unused)),
return 0; return 0;
} }
static grub_err_t
grub_cmd_source (struct grub_arg_list *state __attribute__ ((unused)),
int argc, char **args)
{
if (argc != 1)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "file name required");
grub_normal_execute (args[0], 1);
return 0;
}
GRUB_MOD_INIT(configfile) GRUB_MOD_INIT(configfile)
{ {
@ -47,9 +60,19 @@ GRUB_MOD_INIT(configfile)
grub_register_command ("configfile", grub_cmd_configfile, grub_register_command ("configfile", grub_cmd_configfile,
GRUB_COMMAND_FLAG_BOTH, "configfile FILE", GRUB_COMMAND_FLAG_BOTH, "configfile FILE",
"Load another config file.", 0); "Load another config file.", 0);
grub_register_command ("source", grub_cmd_source,
GRUB_COMMAND_FLAG_BOTH, "source FILE",
"Load another config file without changing context.",
0);
grub_register_command (".", grub_cmd_source,
GRUB_COMMAND_FLAG_BOTH, ". FILE",
"Load another config file without changing context.",
0);
} }
GRUB_MOD_FINI(configfile) GRUB_MOD_FINI(configfile)
{ {
grub_unregister_command ("configfile"); grub_unregister_command ("configfile");
grub_unregister_command ("source");
grub_unregister_command (".");
} }