1.0.25 release

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

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index 9b2a6fe85a4ae145dee0a8bf817661397c3ceefe..a263996a964f05237291abdebe13a96fbc973253 100644 (file)
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -44,6 +44,12 @@ function ventoy_gui_console {
     fi    
 }
 
+function ventoy_acpi_param {  
+    if [ "$VTOY_PARAM_NO_ACPI" != "1" ]; then
+        vt_acpi_param $1 $2
+    fi
+}
+
 function ventoy_power {
     configfile $prefix/power.cfg
 }
@@ -257,6 +263,8 @@ function distro_specify_initrd_file_phase2 {
         if [ "$grub_platform" != "pc" ]; then
             vt_add_replace_file 0 "EFI\\archiso\\archiso.img"
         fi
+    elif [ -f (loop)/blackarch/boot/x86_64/archiso.img ]; then 
+        vt_linux_specify_initrd_file /blackarch/boot/x86_64/archiso.img
     fi
 }
 
@@ -434,6 +442,7 @@ function uefi_windows_menu_func {
     ventoy_debug_pause
     
     if [ -n "$vtoy_chain_mem_addr" ]; then
+        ventoy_acpi_param ${vtoy_chain_mem_addr} 2048
         ventoy_cli_console
         chainloader ${vtoy_path}/ventoy_x64.efi  env_param=${env_param} isoefi=${LoadIsoEfiDriver} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
         boot
@@ -477,6 +486,7 @@ function uefi_linux_menu_func {
         distro_specify_initrd_file
         
         vt_linux_initrd_count vtcount
+        
         if [ $vtcount -eq 0 ]; then
             distro_specify_initrd_file_phase2
             
@@ -495,14 +505,18 @@ function uefi_linux_menu_func {
             if [ -d (loop)/arch ]; then
                 if [ -f (loop)/arch/boot/x86_64/archiso.img ]; then
                     vt_add_replace_file $vtindex "EFI\\archiso\\archiso.img"
+                elif [ -f (loop)/arch/boot/x86_64/initramfs-linux.img ]; then
+                    vt_add_replace_file $vtindex "arch\\boot\\x86_64\\initramfs-linux.img"
                 elif [ -f (loop)/boot/initramfs_x86_64.img ]; then
                     vt_add_replace_file $vtindex "boot\\initramfs_x86_64.img"
                 fi
+            elif [ -d (loop)/blackarch ]; then
+                if [ -f (loop)/blackarch/boot/x86_64/archiso.img ]; then
+                    vt_add_replace_file $vtindex "EFI\\archiso\\archiso.img"
+                fi
             elif [ -d (loop)/parabola ]; then
-                if [ -f (loop)/parabola/boot/x86_64/parabola.img ]; then
-                    vt_add_replace_file $vtindex "EFI\\parabola\\parabola.img"
-                elif [ -f (loop)/boot/initramfs_x86_64.img ]; then
-                    vt_add_replace_file $vtindex "boot\\initramfs_x86_64.img"
+                if [ -f (loop)/parabola/boot/x86_64/parabolaiso.img ]; then
+                    vt_add_replace_file $vtindex "EFI\\parabolaiso\\parabolaiso.img"
                 fi
             elif [ -f (loop)/EFI/BOOT/initrd.gz ]; then
                 vt_add_replace_file $vtindex "EFI\\BOOT\\initrd.gz"
@@ -533,6 +547,7 @@ function uefi_linux_menu_func {
     vt_linux_chain_data ${1}${chosen_path}
 
     if [ -n "$vtoy_chain_mem_addr" ]; then
+        ventoy_acpi_param ${vtoy_chain_mem_addr} 2048
         ventoy_cli_console       
         chainloader ${vtoy_path}/ventoy_x64.efi  env_param=${env_param} isoefi=${LoadIsoEfiDriver} FirstTry=${FirstTryBootFile} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
         boot
@@ -546,6 +561,7 @@ function uefi_unix_menu_func {
     ventoy_unix_comm_proc $1 ${chosen_path}
     
     if [ -n "$vtoy_chain_mem_addr" ]; then
+        ventoy_acpi_param ${vtoy_chain_mem_addr} 2048
         ventoy_cli_console
         chainloader ${vtoy_path}/ventoy_x64.efi  env_param=${env_param} isoefi=${LoadIsoEfiDriver} FirstTry=${FirstTryBootFile} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
         boot
@@ -598,7 +614,7 @@ function uefi_iso_menu_func {
     elif vt_check_mode 1; then
         set ventoy_compatible=YES
     else
-        vt_check_compatible (loop)
+        vt_check_compatible (loop)        
     fi
     
     vt_img_sector ${1}${chosen_path}
@@ -657,6 +673,7 @@ function legacy_windows_menu_func {
     ventoy_debug_pause    
     
     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}        
         boot
     else
@@ -721,6 +738,7 @@ function legacy_linux_menu_func {
     ventoy_debug_pause
     
     if [ -n "$vtoy_chain_mem_addr" ]; then
+        ventoy_acpi_param ${vtoy_chain_mem_addr} 2048
         linux16   $vtoy_path/ipxe.krn ${vtdebug_flag}  mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
         boot
     else
@@ -734,6 +752,7 @@ function legacy_unix_menu_func {
     ventoy_unix_comm_proc $1 ${chosen_path}
     
     if [ -n "$vtoy_chain_mem_addr" ]; then
+        #ventoy_acpi_param ${vtoy_chain_mem_addr} 2048
         linux16   $vtoy_path/ipxe.krn ${vtdebug_flag}  mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
         boot
     else
@@ -991,26 +1010,28 @@ function vhd_unsupport_menuentry {
 }
 
 function vtoyboot_common_func {
-    set efigrubpart=0
+    set AltBootPart=0
     set vtoysupport=0
     
-    vt_get_vtoy_type ${1} vtoytype parttype efigrubpart
+    vt_get_vtoy_type ${1} vtoytype parttype AltBootPart
     
     if vt_str_begin $vtoytype vhd; then    
         set vtoysupport=1
     elif [ "$vtoytype" = "raw" ]; then
         set vtoysupport=1
+    elif [ "$vtoytype" = "vdi" ]; then
+        set vtoysupport=1
     fi
     
     if [ $vtoysupport -eq 1 ]; then    
         if [ "$grub_platform" = "pc" ]; then
-            if [ "$parttype" = "gpt" -a $efigrubpart -eq 0 ]; then
+            if [ "$parttype" = "gpt" -a $AltBootPart -eq 0 ]; then
                 echo "The OS in the vdisk was created in UEFI mode, but current is Legacy BIOS mode."
                 echo "虚拟磁盘内的系统是在UEFI模式下创建的，而当前系统是Legacy BIOS模式，可能无法正常启动。"
                 ventoy_pause
             fi
         else
-            if [ "$parttype" = "mbr" ]; then
+            if [ "$parttype" = "mbr" -a $AltBootPart -eq 0 ]; then
                 echo "The OS in the vdisk was created in Legacy BIOS mode, but current is UEFI mode."
                 echo "虚拟磁盘内的系统是在Legacy BIOS模式下创建的，而当前系统是UEFI模式，可能无法正常启动。"
                 ventoy_pause
@@ -1022,12 +1043,13 @@ function vtoyboot_common_func {
 
         ventoy_debug_pause
         
-        if [ -n "$vtoy_chain_mem_addr" ]; then        
-            if [ "$grub_platform" = "pc" ]; then                    
+        if [ -n "$vtoy_chain_mem_addr" ]; then  
+            if [ "$grub_platform" = "pc" ]; then
                 vt_acpi_param ${vtoy_chain_mem_addr} 512
-                linux16 $vtoy_path/ipxe.krn ${vtdebug_flag}  sector512  mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}   
+                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
                 ventoy_cli_console
                 chainloader ${vtoy_path}/ventoy_x64.efi sector512 env_param=${ventoy_env_param} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
                 boot
@@ -1294,6 +1316,7 @@ function img_common_menuentry {
         fi
     else
         vt_linux_chain_data ${vtoy_iso_part}${vt_chosen_path}
+        ventoy_acpi_param ${vtoy_chain_mem_addr} 512
         if [ "$grub_platform" = "pc" ]; then 
             linux16 $vtoy_path/ipxe.krn ${vtdebug_flag}  sector512  mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}   
             boot
@@ -1321,7 +1344,10 @@ function img_unsupport_menuentry {
 #############################################################
 #############################################################
 
-set VENTOY_VERSION="1.0.21"
+set VENTOY_VERSION="1.0.25"
+
+#ACPI not compatible with Window7/8, so disable by default
+set VTOY_PARAM_NO_ACPI=1
 
 # Default menu display mode, you can change it as you want.
 #    0: List mode   
@@ -1417,7 +1443,7 @@ if [ -n "$vtoy_gfxmode" ]; then
     set gfxmode=$vtoy_gfxmode
     set gfxpayload=keep
 else
-    set gfxmode=1920x1080,1366x768,1024x768,800x600,auto    
+    set gfxmode=1024x768
     set gfxpayload=keep
 fi
 
@@ -1448,6 +1474,7 @@ fi
 #export necessary variable
 export theme
 export gfxmode
+export gfxpayload
 export vtoydev
 export vtoy_path
 export vtdebug_flag