X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/6bd0463d3403c5c3dfe8ef5efe4ff74ceb86eeda..d05eab2be16d355b950a8790dd0abb65c3a1d3e9:/INSTALL/grub/grub.cfg

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index 770a4e2..9c4d6df 100644
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -131,7 +131,7 @@ function get_os_type {
 function vt_check_compatible_pe {
     #Check for PE without external tools
     if [ -f "$1/HBCD_PE.ini" ]; then
-        set ventoy_compatible=YES        
+        set ventoy_compatible=YES
     fi
 }
 
@@ -1230,6 +1230,30 @@ function efi_unsupport_menuentry {
     common_unsupport_menuentry
 }
 
+function vhdboot_common_func {
+    vt_patch_vhdboot "$1"
+    
+    ventoy_debug_pause    
+    
+    if [ -n "$vtoy_vhd_buf_addr" ]; then
+        if [ "$grub_platform" = "pc" ]; then
+            ventoy_cli_console
+            linux16   $vtoy_path/memdisk iso raw    
+            initrd16  mem:${vtoy_vhd_buf_addr}:size:${vtoy_vhd_buf_size}            
+            boot
+            ventoy_gui_console
+        else
+            ventoy_cli_console
+            chainloader ${vtoy_path}/ventoy_${VTOY_EFI_ARCH}.efi memdisk env_param=${env_param} isoefi=${LoadIsoEfiDriver} ${vtdebug_flag} mem:${vtoy_vhd_buf_addr}:size:${vtoy_vhd_buf_size}
+            boot
+            ventoy_gui_console
+        fi
+    else
+        echo "Please put the right ventoy_vhdboot.img file to the 1st partition"
+        ventoy_pause
+    fi
+}
+
 function vhd_common_menuentry {
 
     if [ "$VTOY_VHD_NO_WARNING" != "1" ]; then
@@ -1252,25 +1276,7 @@ function vhd_common_menuentry {
         return
     fi
     
-    vt_patch_vhdboot "$vt_chosen_path"
-    
-    ventoy_debug_pause    
-    
-    if [ -n "$vtoy_vhd_buf_addr" ]; then
-        if [ "$grub_platform" = "pc" ]; then
-            linux16   $vtoy_path/memdisk iso raw    
-            initrd16  mem:${vtoy_vhd_buf_addr}:size:${vtoy_vhd_buf_size}            
-            boot
-        else
-            ventoy_cli_console
-            chainloader ${vtoy_path}/ventoy_${VTOY_EFI_ARCH}.efi memdisk env_param=${env_param} isoefi=${LoadIsoEfiDriver} ${vtdebug_flag} mem:${vtoy_vhd_buf_addr}:size:${vtoy_vhd_buf_size}
-            boot
-            ventoy_gui_console
-        fi        
-    else
-        echo "Please put the right ventoy_vhdboot.img file to the 1st partition"
-        ventoy_pause
-    fi
+    vhdboot_common_func "${vt_chosen_path}"
 }
 
 function vhd_unsupport_menuentry {
@@ -1702,7 +1708,7 @@ function img_unsupport_menuentry {
 #############################################################
 #############################################################
 
-set VENTOY_VERSION="1.0.40"
+set VENTOY_VERSION="1.0.42"
 
 #ACPI not compatible with Window7/8, so disable by default
 set VTOY_PARAM_NO_ACPI=1