mirror of
https://git.proxmox.com/git/grub2
synced 2025-05-19 19:40:36 +00:00
full menuentry command support
This commit is contained in:
parent
004f491eed
commit
b14906860b
@ -40,9 +40,7 @@ grub_extcmd_dispatcher (struct grub_command *cmd, int argc, char **args,
|
||||
context.extcmd = ext;
|
||||
context.script_params = scripts;
|
||||
|
||||
/* Dynamic commands should not perform option parsing before
|
||||
corresponding module gets loaded. */
|
||||
if (cmd->flags & GRUB_COMMAND_FLAG_DYNCMD)
|
||||
if (! ext->options)
|
||||
{
|
||||
ret = (ext->func) (&context, argc, args);
|
||||
return ret;
|
||||
@ -65,7 +63,6 @@ grub_extcmd_dispatcher (struct grub_command *cmd, int argc, char **args,
|
||||
ret = grub_errno;
|
||||
|
||||
grub_free (state);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -29,6 +29,7 @@ static grub_err_t
|
||||
grub_cmd_menuentry (grub_extcmd_context_t ctxt, int argc, char **args)
|
||||
{
|
||||
char *src;
|
||||
unsigned len;
|
||||
grub_err_t r;
|
||||
|
||||
/* XXX Rewrite to make use of already parsed menu definition. */
|
||||
@ -37,9 +38,12 @@ grub_cmd_menuentry (grub_extcmd_context_t ctxt, int argc, char **args)
|
||||
|
||||
src = args[argc - 1];
|
||||
args[argc - 1] = '\0';
|
||||
len = grub_strlen(src);
|
||||
src[len - 1] = '\0';
|
||||
|
||||
r = grub_normal_add_menu_entry (argc - 1, (const char **) args, src);
|
||||
r = grub_normal_add_menu_entry (argc - 1, (const char **) args, src + 1);
|
||||
|
||||
src[len - 1] = '}';
|
||||
args[argc - 1] = src;
|
||||
return r;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user