issue #710

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

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index 0be3f0895f44fcedde5058c4f5408f7b6b71ac56..3bda6d73a87c9020aad3251b3ed091519dd4fbd0 100644 (file)
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -287,7 +287,16 @@ function distro_specify_initrd_file_phase2 {
         if [ -f (loop)/EFI/BOOT/bootx64.efi ]; then
             vt_cpio_busybox64 "64h"
         fi
         if [ -f (loop)/EFI/BOOT/bootx64.efi ]; then
             vt_cpio_busybox64 "64h"
         fi

-        
+    elif [ -f (loop)/boot/initfs.x86_64-efi ]; then
+        vt_linux_specify_initrd_file /boot/initfs.x86_64-efi
+        if [ -f (loop)/boot/initfs.i386-pc ]; then
+            vt_linux_specify_initrd_file /boot/initfs.i386-pc
+        fi
+    elif [ -f (loop)/antiX/initrd.gz ]; then
+        vt_linux_specify_initrd_file /antiX/initrd.gz
+    elif [ -f (loop)/360Disk/initrd.gz ]; then
+        vt_linux_specify_initrd_file /360Disk/initrd.gz
+    

     fi
 }
 
     fi
 }
 


@@ -613,6 +622,12 @@ function uefi_linux_menu_func {
     
     vt_linux_chain_data "${1}${chosen_path}"
 
     
     vt_linux_chain_data "${1}${chosen_path}"
 

+    if [ -n "$LoadIsoEfiDriver" -a $vt_chosen_size -lt 104857600 ]; then
+        if [ -f (loop)/efi/clover/cloverx64.efi ]; then
+            unset LoadIsoEfiDriver
+        fi
+    fi
+

     if [ -n "$vtoy_chain_mem_addr" ]; then
         ventoy_acpi_param ${vtoy_chain_mem_addr} 2048
         ventoy_cli_console       
     if [ -n "$vtoy_chain_mem_addr" ]; then
         ventoy_acpi_param ${vtoy_chain_mem_addr} 2048
         ventoy_cli_console       


@@ -937,7 +952,9 @@ function ventoy_iso_busybox_ver {
             set ventoy_busybox_ver=64
         elif vt_str_begin "$vt_volume_id" "smgl-test-quinq-x86_64"; then
             set ventoy_busybox_ver=64
             set ventoy_busybox_ver=64
         elif vt_str_begin "$vt_volume_id" "smgl-test-quinq-x86_64"; then
             set ventoy_busybox_ver=64

-            
+        elif vt_str_begin "$vt_volume_id" "LDiagBootable"; then
+            set ventoy_busybox_ver=64
+

         fi
     fi
 }
         fi
     fi
 }


@@ -1467,7 +1484,7 @@ function img_unsupport_menuentry {
 #############################################################
 #############################################################
 
 #############################################################
 #############################################################
 

-set VENTOY_VERSION="1.0.31"
+set VENTOY_VERSION="1.0.33"

 
 #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