X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/c0d478c2ddbdac0e64a639995e40ca840a781dbb..78ab7a0759571d88cfbd6096ca3ecf1c28886770:/INSTALL/grub/grub.cfg diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg index b6fa42a..ed372d0 100644 --- a/INSTALL/grub/grub.cfg +++ b/INSTALL/grub/grub.cfg @@ -1044,12 +1044,12 @@ function vtoyboot_common_func { ventoy_debug_pause if [ -n "$vtoy_chain_mem_addr" ]; then - ventoy_acpi_param ${vtoy_chain_mem_addr} 512 - - if [ "$grub_platform" = "pc" ]; then - linux16 $vtoy_path/ipxe.krn ${vtdebug_flag} sector512 mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size} + if [ "$grub_platform" = "pc" ]; then + vt_acpi_param ${vtoy_chain_mem_addr} 512 + linux16 $vtoy_path/ipxe.krn ${vtdebug_flag} bios80 sector512 mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size} boot else + ventoy_acpi_param ${vtoy_chain_mem_addr} 512 ventoy_cli_console chainloader ${vtoy_path}/ventoy_x64.efi sector512 env_param=${ventoy_env_param} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size} boot @@ -1344,7 +1344,10 @@ function img_unsupport_menuentry { ############################################################# ############################################################# -set VENTOY_VERSION="1.0.23" +set VENTOY_VERSION="1.0.26" + +#ACPI not compatible with Window7/8, so disable by default +set VTOY_PARAM_NO_ACPI=1 # Default menu display mode, you can change it as you want. # 0: List mode @@ -1381,7 +1384,7 @@ if [ "$vtoy_dev" = "tftp" ]; then loadfont ascii if [ -f $vtoy_iso_part/ventoy/ventoy.json ]; then - set vt_plugin_path=$vtoy_iso_part + set vt_plugin_path=$vtoy_iso_part else set vt_plugin_path=$prefix vt_load_plugin $vt_plugin_path @@ -1468,6 +1471,15 @@ else terminal_output gfxterm fi + +if [ -n "$VTOY_PLUGIN_SYNTAX_ERROR" ]; then + clear + echo -e "\n Syntax error detected in ventoy.json, please check! \n" + echo -e " ventoy.json 文件中有语法错误,所有配置都不会生效,请检查!\n" + echo -e "\n press ENTER to continue (请按 回车 键继续) ..." + read vtInputKey +fi + #export necessary variable export theme export gfxmode