1.0.23 release

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

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index 7e33c3bd6c8be8dac048239a319c90812cb158be..b6fa42ab5328e63bc6b16be2ffa97b8ac5803a25 100644 (file)
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -44,6 +44,12 @@ function ventoy_gui_console {
     fi    
 }
 
     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
 }
 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
         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
 }
 
     fi
 }
 


@@ -434,6 +442,7 @@ function uefi_windows_menu_func {
     ventoy_debug_pause
     
     if [ -n "$vtoy_chain_mem_addr" ]; then
     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
         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


@@ -496,9 +505,15 @@ 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"
             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 [ -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/parabolaiso.img ]; then
                     vt_add_replace_file $vtindex "EFI\\parabolaiso\\parabolaiso.img"
             elif [ -d (loop)/parabola ]; then
                 if [ -f (loop)/parabola/boot/x86_64/parabolaiso.img ]; then
                     vt_add_replace_file $vtindex "EFI\\parabolaiso\\parabolaiso.img"


@@ -532,6 +547,7 @@ function uefi_linux_menu_func {
     vt_linux_chain_data ${1}${chosen_path}
 
     if [ -n "$vtoy_chain_mem_addr" ]; then
     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
         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


@@ -545,6 +561,7 @@ function uefi_unix_menu_func {
     ventoy_unix_comm_proc $1 ${chosen_path}
     
     if [ -n "$vtoy_chain_mem_addr" ]; then
     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
         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


@@ -597,7 +614,7 @@ function uefi_iso_menu_func {
     elif vt_check_mode 1; then
         set ventoy_compatible=YES
     else
     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}
     fi
     
     vt_img_sector ${1}${chosen_path}


@@ -656,6 +673,7 @@ function legacy_windows_menu_func {
     ventoy_debug_pause    
     
     if [ -n "$vtoy_chain_mem_addr" ]; then
     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
         linux16   $vtoy_path/ipxe.krn ${vtdebug_flag} ibft mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}        
         boot
     else


@@ -720,6 +738,7 @@ function legacy_linux_menu_func {
     ventoy_debug_pause
     
     if [ -n "$vtoy_chain_mem_addr" ]; then
     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
         linux16   $vtoy_path/ipxe.krn ${vtdebug_flag}  mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
         boot
     else


@@ -733,6 +752,7 @@ function legacy_unix_menu_func {
     ventoy_unix_comm_proc $1 ${chosen_path}
     
     if [ -n "$vtoy_chain_mem_addr" ]; then
     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
         linux16   $vtoy_path/ipxe.krn ${vtdebug_flag}  mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
         boot
     else


@@ -1023,9 +1043,10 @@ function vtoyboot_common_func {
 
         ventoy_debug_pause
         
 
         ventoy_debug_pause
         

-        if [ -n "$vtoy_chain_mem_addr" ]; then        
+        if [ -n "$vtoy_chain_mem_addr" ]; then  
+            ventoy_acpi_param ${vtoy_chain_mem_addr} 512
+            

             if [ "$grub_platform" = "pc" ]; 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}   
                 boot
             else
                 linux16 $vtoy_path/ipxe.krn ${vtdebug_flag}  sector512  mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}   
                 boot
             else


@@ -1295,6 +1316,7 @@ function img_common_menuentry {
         fi
     else
         vt_linux_chain_data ${vtoy_iso_part}${vt_chosen_path}
         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
         if [ "$grub_platform" = "pc" ]; then 
             linux16 $vtoy_path/ipxe.krn ${vtdebug_flag}  sector512  mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}   
             boot


@@ -1322,7 +1344,7 @@ function img_unsupport_menuentry {
 #############################################################
 #############################################################
 
 #############################################################
 #############################################################
 

-set VENTOY_VERSION="1.0.22"
+set VENTOY_VERSION="1.0.23"

 
 # Default menu display mode, you can change it as you want.
 #    0: List mode   
 
 # Default menu display mode, you can change it as you want.
 #    0: List mode   


@@ -1418,7 +1440,7 @@ if [ -n "$vtoy_gfxmode" ]; then
     set gfxmode=$vtoy_gfxmode
     set gfxpayload=keep
 else
     set gfxmode=$vtoy_gfxmode
     set gfxpayload=keep
 else

-    set gfxmode=1920x1080,1366x768,1024x768,800x600,auto    
+    set gfxmode=1024x768

     set gfxpayload=keep
 fi
 
     set gfxpayload=keep
 fi
 


@@ -1449,6 +1471,7 @@ fi
 #export necessary variable
 export theme
 export gfxmode
 #export necessary variable
 export theme
 export gfxmode

+export gfxpayload

 export vtoydev
 export vtoy_path
 export vtdebug_flag
 export vtoydev
 export vtoy_path
 export vtdebug_flag