From c0111d6e92951399ca9fe3ec64505b979a8b205a Mon Sep 17 00:00:00 2001 From: marco_g Date: Sun, 30 Apr 2006 20:48:05 +0000 Subject: [PATCH] 2006-04-30 Marco Gerards * 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 `.'. --- ChangeLog | 6 ++++++ commands/configfile.c | 23 +++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/ChangeLog b/ChangeLog index 2d4d62559..2dc1b5e4d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-04-30 Marco Gerards + + * 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 * normal/execute.c (grub_script_execute_cmd): Change the return diff --git a/commands/configfile.c b/commands/configfile.c index a411399cd..81ca70e7a 100644 --- a/commands/configfile.c +++ b/commands/configfile.c @@ -40,6 +40,19 @@ grub_cmd_configfile (struct grub_arg_list *state __attribute__ ((unused)), 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) { @@ -47,9 +60,19 @@ GRUB_MOD_INIT(configfile) grub_register_command ("configfile", grub_cmd_configfile, GRUB_COMMAND_FLAG_BOTH, "configfile FILE", "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_unregister_command ("configfile"); + grub_unregister_command ("source"); + grub_unregister_command ("."); }