update CI build script

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

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index b1bc0388fc2722b6447a6304ea2ae63e75e5f1f5..15fe1e61f34bf4f74c9a529b21e03b8cefa3bc34 100644 (file)
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -294,6 +294,8 @@ function distro_specify_initrd_file_phase2 {
         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
 }
@@ -620,6 +622,12 @@ function uefi_linux_menu_func {
     
     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       
@@ -944,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
-            
+        elif vt_str_begin "$vt_volume_id" "LDiagBootable"; then
+            set ventoy_busybox_ver=64
+
         fi
     fi
 }
@@ -1170,7 +1180,7 @@ function vtoyboot_common_func {
                 linux16 $vtoy_path/ipxe.krn ${vtdebug_flag} bios80  sector512  mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}   
                 boot
             else
-                ventoy_acpi_param ${vtoy_chain_mem_addr} 512
+                vt_acpi_param ${vtoy_chain_mem_addr} 512
                 ventoy_cli_console
                 chainloader ${vtoy_path}/ventoy_${VTOY_EFI_ARCH}.efi sector512 env_param=${ventoy_env_param} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
                 boot
@@ -1474,7 +1484,7 @@ function img_unsupport_menuentry {
 #############################################################
 #############################################################
 
-set VENTOY_VERSION="1.0.32"
+set VENTOY_VERSION="1.0.33"
 
 #ACPI not compatible with Window7/8, so disable by default
 set VTOY_PARAM_NO_ACPI=1
@@ -1621,6 +1631,17 @@ if [ -n "$VTOY_PLUGIN_SYNTAX_ERROR" ]; then
     read vtInputKey 
 fi
 
+for vtTFile in ventoy.json ventoy_grub.cfg; do
+    if [ -f $vtoy_efi_part/ventoy/$vtTFile ]; then
+        clear
+        echo -e "\n You need to put $vtTFile in the 1st partition which hold the ISO files.\n"
+        echo -e " $vtTFile 放错分区了，请放到镜像分区里的 ventoy 目录下（此目录需要手动创建）！\n"
+        echo -e "\n press ENTER to continue (请按 回车 键继续) ..."
+        read vtInputKey
+    fi
+done
+
+
 #export necessary variable
 export theme
 export gfxmode