Update languages.json (#1650)

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

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index 73a28223e784b992b690606db7e3ccacf6ca03cf..0c07bf28a858f99eab735cb0e87822970c75d432 100644 (file)
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -111,12 +111,18 @@ function ventoy_show_help {
 function get_os_type {
     set vtoy_os=Linux
     
-    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        
+    if vt_str_begin "$vt_volume_id" "DLC Boot"; then
+        if [ -f (loop)/DLCBoot.exe ]; then
             set vtoy_os=Windows
-            break
         fi
-    done
+    else
+        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            
+                break
+            fi
+        done
+    fi
 
     if [ "$vtoy_os" = "Linux" ]; then
         if vt_strstr "$vt_system_id" "FreeBSD"; then
@@ -206,6 +212,15 @@ function distro_specify_wim_patch_phase2 {
     if [ -f (loop)/boot/boot.wim ]; then
         vt_windows_collect_wim_patch wim /boot/boot.wim
     fi
+
+    if vt_str_begin "$vt_volume_id" "DLC Boot"; then
+        for vwfile in "/DLC1/WinPE/W11x64.wim" "/DLC1/WinPE/W10x64.wim" "/DLC1/WinPE/W10x86.wim"; do
+            if [ -f (loop)/$vwfile ]; then
+                vt_windows_collect_wim_patch wim $vwfile
+            fi
+        done
+    fi
+    
 }
 
 
@@ -364,7 +379,8 @@ function distro_specify_initrd_file_phase2 {
         vt_linux_specify_initrd_file /initrd0.img
     elif [ -f (loop)/sysresccd/boot/i686/sysresccd.img ]; then
         vt_linux_specify_initrd_file /sysresccd/boot/i686/sysresccd.img
-    
+    elif [ -f (loop)/boot/full.cz ]; then
+        vt_linux_specify_initrd_file /boot/full.cz
     
     fi
 }
@@ -1037,7 +1053,11 @@ function legacy_windows_menu_func {
 
     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"
@@ -1281,7 +1301,7 @@ function iso_common_menuentry {
     unset vt_system_id
     unset vt_volume_id
     
-    vt_chosen_img_path vt_chosen_path vt_chosen_size
+    vt_chosen_img_path vt_chosen_path vt_chosen_size vt_chosen_name
 
     vt_parse_iso_volume "${vtoy_iso_part}${vt_chosen_path}" vt_system_id vt_volume_id vt_volume_space
     if [ $vt_volume_space -ne $vt_chosen_size ]; then        
@@ -1329,10 +1349,17 @@ function iso_common_menuentry {
             elif vt_iso_vd_id_begin 0 1 "KolibriOS"; then
                 set vtMemDiskBoot=1
             fi
-        fi 
+        fi
+        
+        #For iKuai8 (<64MB)
+        if [ $vt_chosen_size -le 67108864 ]; then
+            if vt_str_begin "$vt_chosen_name" "iKuai"; then
+                set vtMemDiskBoot=1
+            fi
+        fi
     fi
     vt_iso_vd_id_clear
-        
+
 
     if [ "$grub_platform" = "pc" ]; then
         if [ -n "$vtMemDiskBoot" ]; then
@@ -1445,22 +1472,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
 }
 
@@ -1640,7 +1667,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
-            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
 
@@ -2113,7 +2142,7 @@ function img_unsupport_menuentry {
 #############################################################
 #############################################################
 
-set VENTOY_VERSION="1.0.71"
+set VENTOY_VERSION="1.0.75"
 
 #ACPI not compatible with Window7/8, so disable by default
 set VTOY_PARAM_NO_ACPI=1
@@ -2267,6 +2296,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