X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/ddf0617d83dcac7409003eacae1dfcbf7fcdce02..4f64aecfa3a2cd0110074ba75c8eaffcc60115cb:/INSTALL/grub/grub.cfg?ds=inline

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index 1c9ac28..0c07bf2 100644
--- 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        
-            set vtoy_os=Windows            
-            break
+    if vt_str_begin "$vt_volume_id" "DLC Boot"; then
+        if [ -f (loop)/DLCBoot.exe ]; then
+            set vtoy_os=Windows
         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
+    
 }
 
 
@@ -1286,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        
@@ -1334,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
@@ -2120,7 +2142,7 @@ function img_unsupport_menuentry {
 #############################################################
 #############################################################
 
-set VENTOY_VERSION="1.0.74"
+set VENTOY_VERSION="1.0.75"
 
 #ACPI not compatible with Window7/8, so disable by default
 set VTOY_PARAM_NO_ACPI=1