Merge branch 'master' of https://github.com/ventoy/Ventoy

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

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index f359d015506684a86fcd7eb31d4aef7a6f833019..c34489f0814cc672577ffec717019d677fa1da1e 100644 (file)
--- 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        
     
     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
             break
         fi
     done


@@ -1037,7 +1037,11 @@ function legacy_windows_menu_func {
 
     if [ -n "$vtoy_chain_mem_addr" ]; then
         ventoy_acpi_param ${vtoy_chain_mem_addr} 2048
 
     if [ -n "$vtoy_chain_mem_addr" ]; then
         ventoy_acpi_param ${vtoy_chain_mem_addr} 2048

-        linux16   $vtoy_path/ipxe.krn ${vtdebug_flag} ibft mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}        
+        if [ "$ventoy_compatible" = "NO" ]; then
+            linux16   $vtoy_path/ipxe.krn ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
+        else
+            linux16   $vtoy_path/ipxe.krn ${vtdebug_flag} ibft mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
+        fi

         boot
     else
         echo "chain empty failed"
         boot
     else
         echo "chain empty failed"


@@ -1445,22 +1449,22 @@ function efi_common_menuentry {
         vt_vlnk_dst="${vtoy_iso_part}${vt_chosen_path}"
     fi
     
         vt_vlnk_dst="${vtoy_iso_part}${vt_chosen_path}"
     fi
     

-    vt_concat_efi_iso "${vt_vlnk_dst}" vtoy_iso_buf
-    

     ventoy_debug_pause
     ventoy_debug_pause

-    
+

     ventoy_cli_console
     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}
     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
 }
 
     ventoy_gui_console
 }
 


@@ -1640,7 +1644,9 @@ function ventoy_img_easyos {
     
     if [ -n "$vt_module_ver" ]; then        
         for mod in "kernel/drivers/md/dm-mod.ko" "kernel/drivers/dax/dax.ko"; do
     
     if [ -n "$vt_module_ver" ]; then        
         for mod in "kernel/drivers/md/dm-mod.ko" "kernel/drivers/dax/dax.ko"; do

-            vt_img_extra_initrd_append  (easysfs)/lib/modules/$vt_module_ver/$mod
+            if [ -e (easysfs)/lib/modules/$vt_module_ver/$mod ]; then
+                vt_img_extra_initrd_append  (easysfs)/lib/modules/$vt_module_ver/$mod
+            fi

         done
     fi
 
         done
     fi
 


@@ -2113,7 +2119,7 @@ function img_unsupport_menuentry {
 #############################################################
 #############################################################
 
 #############################################################
 #############################################################
 

-set VENTOY_VERSION="1.0.72"
+set VENTOY_VERSION="1.0.74"

 
 #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


@@ -2267,6 +2273,11 @@ else
     terminal_output  gfxterm
 fi
 
     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
 if [ -n "$VTOY_DEFAULT_KBD_LAYOUT" ]; then
     set_keyboard_layout "$VTOY_DEFAULT_KBD_LAYOUT"
 fi