Only use acpi when secureboot if enabled in UEFI mode.

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

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index 8cb8fe069f96eebad8fe666ac8bc82a3077c68c6..c497c6691a4dd4d8fe573b99b2402a78fabba5f9 100644 (file)
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -50,6 +50,21 @@ function ventoy_acpi_param {
     fi
 }
 
     fi
 }
 

+function ventoy_vcfg_proc {
+    if vt_check_custom_boot "${1}" vt_vcfg; then
+        set vtoy_chosen_path="${1}"
+        vt_file_basefile "${vtoy_chosen_path}" vtoy_chosen_file
+        
+        export vtoy_chosen_path
+        export vtoy_chosen_file
+        ventoy_debug_pause
+        configfile "${vtoy_iso_part}${vt_vcfg}"
+        true
+    else
+        false
+    fi
+}
+

 function ventoy_power {
     configfile $prefix/power.cfg
 }
 function ventoy_power {
     configfile $prefix/power.cfg
 }


@@ -622,6 +637,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       


@@ -946,22 +967,41 @@ 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
 }
 

+

 function iso_common_menuentry {
     unset vt_system_id
     unset vt_volume_id
     
     vt_chosen_img_path vt_chosen_path vt_chosen_size
 function iso_common_menuentry {
     unset vt_system_id
     unset vt_volume_id
     
     vt_chosen_img_path vt_chosen_path vt_chosen_size

-    vt_parse_iso_volume "${vtoy_iso_part}${vt_chosen_path}" vt_system_id vt_volume_id
+
+    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        
+        vt_mod $vt_chosen_size 2048 vt_chosen_size_mod
+        if [ $vt_volume_space -gt $vt_chosen_size -o $vt_chosen_size_mod -ne 0 ]; then
+            echo -e "\n $vt_volume_space $vt_chosen_size $vt_chosen_size_mod\n"
+            echo -e "\n The size of the iso file \"$vt_chosen_size\" is invalid. File corrupted ?\n"
+            echo -e " 此ISO文件的大小 \"$vt_chosen_size\" 有问题，请确认文件是否损坏。\n"
+            echo -e "\n press ENTER to exit (请按 回车 键返回) ..."
+            read vtInputKey
+            return
+        fi
+    fi

     
     if vt_check_password "${vt_chosen_path}"; then
         return
     fi
     
     if vt_check_password "${vt_chosen_path}"; then
         return
     fi

-        
+
+    if ventoy_vcfg_proc "${vt_chosen_path}"; then        
+        return
+    fi
+

     if vt_str_begin "$vt_volume_id" "Avira"; then 
         vt_skip_svd "${vtoy_iso_part}${vt_chosen_path}"
     fi
     if vt_str_begin "$vt_volume_id" "Avira"; then 
         vt_skip_svd "${vtoy_iso_part}${vt_chosen_path}"
     fi


@@ -1031,6 +1071,10 @@ function wim_common_menuentry {
         return
     fi
     
         return
     fi
     

+    if ventoy_vcfg_proc "${vt_chosen_path}"; then        
+        return
+    fi
+    

     if vt_wim_check_bootable "${vtoy_iso_part}${vt_chosen_path}"; then
         vt_wim_chain_data "${vtoy_iso_part}${vt_chosen_path}"
     else
     if vt_wim_check_bootable "${vtoy_iso_part}${vt_chosen_path}"; then
         vt_wim_chain_data "${vtoy_iso_part}${vt_chosen_path}"
     else


@@ -1066,6 +1110,10 @@ function efi_common_menuentry {
         return
     fi
     
         return
     fi
     

+    if ventoy_vcfg_proc "${vt_chosen_path}"; then        
+        return
+    fi
+    

     vt_concat_efi_iso "${vtoy_iso_part}${vt_chosen_path}" vtoy_iso_buf
     
     ventoy_debug_pause
     vt_concat_efi_iso "${vtoy_iso_part}${vt_chosen_path}" vtoy_iso_buf
     
     ventoy_debug_pause


@@ -1107,6 +1155,10 @@ function vhd_common_menuentry {
         return
     fi
     
         return
     fi
     

+    if ventoy_vcfg_proc "${vt_chosen_path}"; then        
+        return
+    fi
+    

     vt_patch_vhdboot "$vt_chosen_path"
     
     ventoy_debug_pause    
     vt_patch_vhdboot "$vt_chosen_path"
     
     ventoy_debug_pause    


@@ -1172,7 +1224,9 @@ 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
                 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
+                if vt_check_secureboot_var; then
+                    vt_acpi_param ${vtoy_chain_mem_addr} 512
+                fi

                 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
                 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


@@ -1195,6 +1249,10 @@ function vtoy_common_menuentry {
         return
     fi    
     
         return
     fi    
     

+    if ventoy_vcfg_proc "${vt_chosen_path}"; then        
+        return
+    fi
+    

     vtoyboot_common_func "${vtoy_iso_part}${vt_chosen_path}"
 }
 
     vtoyboot_common_func "${vtoy_iso_part}${vt_chosen_path}"
 }
 


@@ -1398,6 +1456,10 @@ function img_common_menuentry {
         return
     fi
 
         return
     fi
 

+    if ventoy_vcfg_proc "${vt_chosen_path}"; then        
+        return
+    fi
+

     if [ -d (vtimghd)/ ]; then
         loopback -d vtimghd
     fi
     if [ -d (vtimghd)/ ]; then
         loopback -d vtimghd
     fi


@@ -1476,7 +1538,7 @@ function img_unsupport_menuentry {
 #############################################################
 #############################################################
 
 #############################################################
 #############################################################
 

-set VENTOY_VERSION="1.0.32"
+set VENTOY_VERSION="1.0.34"

 
 #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


@@ -1623,6 +1685,17 @@ if [ -n "$VTOY_PLUGIN_SYNTAX_ERROR" ]; then
     read vtInputKey 
 fi
 
     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
 #export necessary variable
 export theme
 export gfxmode