X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/ed1aa3d5be7daa8ffd0b3d050609cd9eab492e79..9e2e4ec0a972fdbfe4edff46077061f82aaada99:/INSTALL/grub/grub.cfg diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg index f359d01..c44ff10 100644 --- a/INSTALL/grub/grub.cfg +++ b/INSTALL/grub/grub.cfg @@ -113,7 +113,7 @@ function get_os_type { for file in "efi/microsoft/boot/bcd" "sources/boot.wim" "boot/bcd" "bootmgr.efi" "boot/etfsboot.com" ; do if vt_file_exist_nocase (loop)/$file; then - set vtoy_os=Windows + set vtoy_os=Windows break fi done @@ -1445,22 +1445,22 @@ function efi_common_menuentry { vt_vlnk_dst="${vtoy_iso_part}${vt_chosen_path}" fi - vt_concat_efi_iso "${vt_vlnk_dst}" vtoy_iso_buf - ventoy_debug_pause - + ventoy_cli_console + + #first try with chainload + set vtOldRoot=$root + set root=$vtoy_iso_part + chainloader "${vt_vlnk_dst}" + boot - unset vtoy_dotefi_retry + #retry with isoboot + set root=$vtOldRoot + vt_concat_efi_iso "${vt_vlnk_dst}" vtoy_iso_buf chainloader ${vtoy_path}/ventoy_${VTOY_EFI_ARCH}.efi memdisk env_param=${env_param} dotefi isoefi=on ${vtdebug_flag} mem:${vtoy_iso_buf_addr}:size:${vtoy_iso_buf_size} - boot - - if [ -n "$vtoy_dotefi_retry" ]; then - unset vtoy_dotefi_retry - chainloader "${vt_vlnk_dst}" - boot - fi - + boot + ventoy_gui_console } @@ -2113,7 +2113,7 @@ function img_unsupport_menuentry { ############################################################# ############################################################# -set VENTOY_VERSION="1.0.72" +set VENTOY_VERSION="1.0.73" #ACPI not compatible with Window7/8, so disable by default set VTOY_PARAM_NO_ACPI=1 @@ -2267,6 +2267,11 @@ else terminal_output gfxterm fi +if [ "$grub_platform" = "efi" ]; then + set mouse_delta=4000 + # terminal_input --append mouse +fi + if [ -n "$VTOY_DEFAULT_KBD_LAYOUT" ]; then set_keyboard_layout "$VTOY_DEFAULT_KBD_LAYOUT" fi