1.0.39 release

This commit is contained in:
longpanda 2021-03-28 17:18:23 +08:00
parent 58d387f732
commit f4bbec65ba
10 changed files with 148 additions and 12 deletions

View file

@ -42,6 +42,7 @@ int g_ventoy_last_entry = -1;
int g_ventoy_suppress_esc = 0;
int g_ventoy_menu_esc = 0;
int g_ventoy_fn_mutex = 0;
int g_ventoy_terminal_output = 0;
/* Time to delay after displaying an error message about a default/fallback
entry failing to boot. */
@ -871,15 +872,18 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
}
break;
case GRUB_TERM_KEY_F7:
case '7':
cmdstr = grub_env_get("VTOY_F7_CMD");
if (cmdstr)
menu_fini ();
if (g_ventoy_terminal_output == 0)
{
menu_fini ();
grub_script_execute_sourcecode(cmdstr);
goto refresh;
grub_script_execute_sourcecode("terminal_output console");
g_ventoy_terminal_output = 1;
}
break;
else
{
grub_script_execute_sourcecode("terminal_output gfxterm");
g_ventoy_terminal_output = 0;
}
goto refresh;
case GRUB_TERM_KEY_F1:
case '1':
menu_fini ();