X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/51b92f398a2d29e0be79f770b14a14fb2c652082..9615e7eaa0cb6d02ac3d94f0bf7d06f3ffc277ed:/INSTALL/grub/grub.cfg diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg index e0dc654..dc3f646 100644 --- a/INSTALL/grub/grub.cfg +++ b/INSTALL/grub/grub.cfg @@ -130,6 +130,11 @@ function get_os_type { function vt_check_compatible_pe { #Check for PE without external tools + #set compatible if ISO file is less than 80MB + if [ $vt_chosen_size -gt 33554432 -a $vt_chosen_size -le 83886080 ]; then + set ventoy_compatible=YES + fi + return } @@ -159,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 { @@ -921,7 +930,7 @@ function legacy_windows_menu_func { loopback loop "$1$2" fi - for file in "boot/bcd" "/efi/microsoft/boot/bcd" "SSTR/BCD"; do + for file in "boot/bcd" "/efi/microsoft/boot/bcd" "SSTR/BCD" "boot/bce"; do vt_windows_collect_wim_patch bcd (loop)/$file done @@ -961,6 +970,14 @@ function legacy_linux_menu_func { set ventoy_fs_probe=iso9660 loopback loop "$1$2" fi + + if [ -f (loop)/isolinux/isolinux.cfg ]; then + if vt_iso9660_isjoliet; then + vt_iso9660_nojoliet 1 + loopback -d loop + loopback loop "$1$2" + fi + fi vt_load_cpio $vtoy_path "$2" "$1" "busybox=$ventoy_busybox_ver" @@ -1844,7 +1861,7 @@ function img_unsupport_menuentry { ############################################################# ############################################################# -set VENTOY_VERSION="1.0.47" +set VENTOY_VERSION="1.0.50" #ACPI not compatible with Window7/8, so disable by default set VTOY_PARAM_NO_ACPI=1