X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/0b7fa630a477204220c87eac8a4005ee9f205d64..112c557428e19a2ab303ea73d7123044299e0f66:/INSTALL/grub/grub.cfg diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg index 0ef39ea..2b3be95 100644 --- a/INSTALL/grub/grub.cfg +++ b/INSTALL/grub/grub.cfg @@ -164,7 +164,11 @@ function distro_specify_wim_patch { vt_windows_collect_wim_patch wim /BOOT/H3_7PE.WIM vt_windows_collect_wim_patch wim /BOOT/H3_8PE.WIM vt_windows_collect_wim_patch wim /BOOT/H3_81PE.WIM - fi + elif [ -d (loop)/2k10/winpe ]; then + vt_windows_collect_wim_patch wim /2k10/winpe/w1086pe.wim + vt_windows_collect_wim_patch wim /2k10/winpe/w8x86pe.wim + vt_windows_collect_wim_patch wim /2k10/winpe/w7x86pe.wim + fi } function distro_specify_wim_patch_phase2 { @@ -1754,6 +1758,7 @@ function legacy_img_memdisk { function img_common_menuentry { set ventoy_compatible=YES set ventoy_busybox_ver=32 + unset LoadIsoEfiDriver vt_chosen_img_path vt_chosen_path vt_chosen_size @@ -1857,7 +1862,7 @@ function img_unsupport_menuentry { ############################################################# ############################################################# -set VENTOY_VERSION="1.0.49" +set VENTOY_VERSION="1.0.50" #ACPI not compatible with Window7/8, so disable by default set VTOY_PARAM_NO_ACPI=1 @@ -1935,9 +1940,11 @@ vt_load_part_table $vtoydev #Load Plugin if [ -f $vtoy_iso_part/ventoy/ventoy.json ]; then - clear - vt_load_plugin $vtoy_iso_part - clear + clear + vt_load_plugin $vtoy_iso_part + clear +else + vt_check_json_path_case $vtoy_iso_part fi if [ -n "$VTOY_MENU_TIMEOUT" ]; then @@ -2004,6 +2011,15 @@ if [ -n "$VTOY_DEFAULT_KBD_LAYOUT" ]; then set_keyboard_layout "$VTOY_DEFAULT_KBD_LAYOUT" fi +if [ -n "$VTOY_PLUGIN_PATH_CASE_MISMATCH" ]; then + clear + echo "$VTOY_PLUGIN_PATH_CASE_MISMATCH" + echo -e "\n\nPath case does not match! ventoy directory and ventoy.json MUST be all lowercase!" + echo -e "\n路径大小写不匹配!ventoy 目录和 ventoy.json 文件的名字必须是全部小写,请修正!" + echo -e "\n\npress ENTER to continue (请按回车键继续) ..." + read vtInputKey +fi + if [ -n "$VTOY_PLUGIN_SYNTAX_ERROR" ]; then clear echo -e "\n Syntax error detected in ventoy.json, please check! \n"