Support Lenovo EasyStartup

[Ventoy.git] / INSTALL / grub / grub.cfg

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index 51bb8ef251b3347faac4e15399c3b2a14a200fbc..e596a0aad2b68891773adf928377a6b5f822e7b7 100644 (file)
--- 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
 
 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
 }
 
     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
         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 {
 }
 
 function distro_specify_wim_patch_phase2 {


@@ -752,6 +761,8 @@ function ventoy_reset_nojoliet {
     else
         vt_iso9660_nojoliet 0
     fi
     else
         vt_iso9660_nojoliet 0
     fi

+    
+    vt_append_extra_sector 0

 }
 
 function uefi_iso_menu_func {
 }
 
 function uefi_iso_menu_func {


@@ -778,6 +789,12 @@ function uefi_iso_menu_func {
     else
         set ventoy_fs_probe=iso9660
         ventoy_reset_nojoliet
     else
         set ventoy_fs_probe=iso9660
         ventoy_reset_nojoliet

+
+        # Lenovo EasyStartup need an addional sector for boundary check
+        if vt_str_begin "$vt_volume_id" "EasyStartup"; then
+            vt_skip_svd "${vtoy_iso_part}${vt_chosen_path}"
+            vt_append_extra_sector 1
+        fi

     fi
 
     loopback loop "${1}${chosen_path}"
     fi
 
     loopback loop "${1}${chosen_path}"


@@ -961,6 +978,14 @@ function legacy_linux_menu_func {
             set ventoy_fs_probe=iso9660
             loopback loop "$1$2"
         fi
             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"
 
     
         vt_load_cpio  $vtoy_path  "$2" "$1" "busybox=$ventoy_busybox_ver"
 


@@ -1741,6 +1766,7 @@ function legacy_img_memdisk {
 function img_common_menuentry {
     set ventoy_compatible=YES
     set ventoy_busybox_ver=32
 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
     
 
     vt_chosen_img_path vt_chosen_path vt_chosen_size
     


@@ -1844,7 +1870,7 @@ function img_unsupport_menuentry {
 #############################################################
 #############################################################
 
 #############################################################
 #############################################################
 

-set VENTOY_VERSION="1.0.48"
+set VENTOY_VERSION="1.0.50"

 
 #ACPI not compatible with Window7/8, so disable by default
 set VTOY_PARAM_NO_ACPI=1
 
 #ACPI not compatible with Window7/8, so disable by default
 set VTOY_PARAM_NO_ACPI=1


@@ -1922,9 +1948,11 @@ vt_load_part_table $vtoydev
 
 #Load Plugin
 if [ -f $vtoy_iso_part/ventoy/ventoy.json ]; then
 
 #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
 fi
 
 if [ -n "$VTOY_MENU_TIMEOUT" ]; then


@@ -1991,6 +2019,15 @@ if [ -n "$VTOY_DEFAULT_KBD_LAYOUT" ]; then
     set_keyboard_layout "$VTOY_DEFAULT_KBD_LAYOUT"
 fi
 
     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"
 if [ -n "$VTOY_PLUGIN_SYNTAX_ERROR" ]; then
     clear
     echo -e "\n Syntax error detected in ventoy.json, please check! \n"