X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/260a3269b71db3e026ddbbcfddc884fbc3104d70..147a23c9dd37b84faf4316cd4d35facede55a33f:/INSTALL/grub/grub.cfg

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index df7d9a6..bafba8d 100644
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -44,11 +44,18 @@ 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
 }
 
-function ventoy_diagnosis {    
+function ventoy_diagnosis {
+    vt_enum_video_mode    
     configfile $prefix/debug.cfg
 }
 
@@ -251,6 +258,18 @@ function distro_specify_initrd_file_phase2 {
         if [ "$grub_platform" != "pc" ]; then
             vt_add_replace_file 0 "minimal\\x86_64\\rootfs.xz"
         fi
+    elif [ -f (loop)/arch/boot/x86_64/archiso.img ]; then 
+        vt_linux_specify_initrd_file /arch/boot/x86_64/archiso.img
+        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
+        
+    elif [ -f (loop)/install.amd/initrd.gz ]; then
+        vt_linux_specify_initrd_file /live/initrd2.img
+        vt_linux_specify_initrd_file /install.amd/initrd.gz
+        vt_linux_specify_initrd_file /install.amd/gtk/initrd.gz
         
     fi
 }
@@ -429,6 +448,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
@@ -439,6 +459,7 @@ function uefi_windows_menu_func {
 }
 
 function uefi_linux_menu_func {
+    
     if [ "$ventoy_compatible" = "NO" ]; then    
         
         if [ "$ventoy_fs_probe" = "udf" ]; then
@@ -471,6 +492,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
             
@@ -489,9 +511,19 @@ 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/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"
             elif [ -f (loop)/loader/entries/thinstation.conf ]; then
@@ -507,7 +539,7 @@ function uefi_linux_menu_func {
             fi
         elif [ -d (loop)/EFI/BOOT/entries ]; then
             if [ -f (loop)/parabola/boot/x86_64/parabolaiso.img ]; then
-                vt_add_replace_file 0 "EFI\\parabolaiso\\parabolaiso.img"            
+                vt_add_replace_file 0 "EFI\\parabolaiso\\parabolaiso.img"
             fi
         elif [ -e (loop)/syslinux/alt0/full.cz ]; then
             vt_add_replace_file 0 "EFI\\BOOT\\full.cz"            
@@ -521,6 +553,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
@@ -534,6 +567,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
@@ -586,11 +620,15 @@ 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}
     
+    if [ "$ventoy_fs_probe" = "iso9660" ]; then
+        vt_select_conf_replace ${1} ${chosen_path}
+    fi
+    
     if [ "$vtoy_os" = "Windows" ]; then
         vt_check_compatible_pe (loop)        
         uefi_windows_menu_func  $1 ${chosen_path}
@@ -645,9 +683,8 @@ function legacy_windows_menu_func {
     ventoy_debug_pause    
     
     if [ -n "$vtoy_chain_mem_addr" ]; then
-        linux16   $vtoy_path/ipxe.krn ${vtdebug_flag} ibft mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
-        set gfxmode=1920x1080,1366x768,1024x768,800x600,auto
-        terminal_output gfxterm
+        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
         echo "chain empty failed"
@@ -711,6 +748,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
@@ -724,6 +762,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
@@ -753,7 +792,7 @@ function legacy_iso_menu_func {
     loopback loop ${1}${chosen_path}
     
     get_os_type (loop)
-
+    
     if [ -n "$vtcompat" ]; then
         set ventoy_compatible=YES
         unset vtcompat
@@ -765,6 +804,10 @@ function legacy_iso_menu_func {
     
     vt_img_sector ${1}${chosen_path}
 
+    if [ "$ventoy_fs_probe" = "iso9660" ]; then
+        vt_select_conf_replace ${1} ${chosen_path}
+    fi
+
     if [ "$vtoy_os" = "Windows" ]; then
         vt_check_compatible_pe (loop)        
         legacy_windows_menu_func  $1 ${chosen_path}
@@ -864,6 +907,10 @@ function iso_common_menuentry {
 function miso_common_menuentry {
     vt_chosen_img_path vt_chosen_path vt_chosen_size
 
+    echo "memdisk mode boot for $vt_chosen_path"
+    echo ""
+    ventoy_debug_pause
+
     if [ "$grub_platform" = "pc" ]; then
         legacy_iso_memdisk $vtoy_iso_part $vt_chosen_path
     else
@@ -895,9 +942,7 @@ function wim_common_menuentry {
     
     if [ -n "$vtoy_chain_mem_addr" ]; then
         if [ "$grub_platform" = "pc" ]; then
-            linux16   $vtoy_path/ipxe.krn ${vtdebug_flag}  mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
-            set gfxmode=1920x1080,1366x768,1024x768,800x600,auto
-            terminal_output gfxterm
+            linux16   $vtoy_path/ipxe.krn ${vtdebug_flag}  mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}            
         else
             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}
@@ -940,7 +985,6 @@ function efi_unsupport_menuentry {
     common_unsupport_menuentry
 }
 
-
 function vhd_common_menuentry {
 
     if [ "$VTOY_VHD_NO_WARNING" != "1" ]; then
@@ -954,17 +998,14 @@ function vhd_common_menuentry {
     fi
 
     vt_chosen_img_path vt_chosen_path vt_chosen_size
-    vt_patch_vhdboot ${vtoy_iso_part} ${vt_chosen_path}
+    vt_patch_vhdboot $vt_chosen_path
     
     ventoy_debug_pause    
     
     if [ -n "$vtoy_vhd_buf_addr" ]; then
         if [ "$grub_platform" = "pc" ]; then
             linux16   $vtoy_path/memdisk iso raw    
-            initrd16  mem:${vtoy_vhd_buf_addr}:size:${vtoy_vhd_buf_size}
-            
-            set gfxmode=1920x1080,1366x768,1024x768,800x600,auto
-            terminal_output gfxterm
+            initrd16  mem:${vtoy_vhd_buf_addr}:size:${vtoy_vhd_buf_size}            
             boot
         else
             ventoy_cli_console
@@ -973,7 +1014,7 @@ function vhd_common_menuentry {
             ventoy_gui_console
         fi        
     else
-        echo "Failed to boot vhd file"
+        echo "Please put the right ventoy_vhdboot.img file to the 1st partition"
         ventoy_pause
     fi
 }
@@ -982,6 +1023,71 @@ function vhd_unsupport_menuentry {
     common_unsupport_menuentry
 }
 
+function vtoyboot_common_func {
+    set AltBootPart=0
+    set vtoysupport=0
+    
+    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 $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" -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
+            fi
+        fi
+    
+        vt_img_sector ${1}
+        vt_raw_chain_data ${1}
+
+        ventoy_debug_pause
+        
+        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} 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
+                ventoy_gui_console
+            fi  
+        else
+            echo "chain empty failed!"
+            ventoy_pause
+        fi
+    else
+        echo "Unsupported vtoy type $vtoytype"
+        ventoy_pause
+    fi
+}
+
+function vtoy_common_menuentry {    
+    vt_chosen_img_path vt_chosen_path vt_chosen_size        
+    vtoyboot_common_func ${vtoy_iso_part}${vt_chosen_path}
+}
+
+function vtoy_unsupport_menuentry {
+    common_unsupport_menuentry
+}
+
 #
 #============================================================#
 # IMG file boot process                                      #
@@ -1223,10 +1329,12 @@ function img_common_menuentry {
             ventoy_img_memtest86            
         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 
-            img_unsupport_tip
-        else
-            vt_linux_chain_data ${vtoy_iso_part}${vt_chosen_path}
+            linux16 $vtoy_path/ipxe.krn ${vtdebug_flag}  sector512  mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}   
+            boot
+        else            
             chainloader ${vtoy_path}/ventoy_x64.efi sector512 env_param=${env_param} isoefi=${LoadIsoEfiDriver} FirstTry=${FirstTryBootFile} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
             boot
         fi
@@ -1250,7 +1358,10 @@ function img_unsupport_menuentry {
 #############################################################
 #############################################################
 
-set VENTOY_VERSION="1.0.20"
+set VENTOY_VERSION="1.0.27"
+
+#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   
@@ -1277,16 +1388,17 @@ vt_device $root  vtoy_dev
 if [ "$vtoy_dev" = "tftp" ]; then
     set vtoy_path=($root)
     for vtid in 0 1 2 3; do
-        if [ -d (hd$vtid,2)/ventoy ]; then
+        if [ -f (hd$vtid,2)/ventoy/ventoy.cpio ]; then
             set vtoy_iso_part=(hd$vtid,1)
             set vtoy_efi_part=(hd$vtid,2)
+            set vtoydev=hd$vtid
             break
         fi
     done
     loadfont ascii
 
     if [ -f $vtoy_iso_part/ventoy/ventoy.json ]; then
-       set vt_plugin_path=$vtoy_iso_part
+        set vt_plugin_path=$vtoy_iso_part
     else
         set vt_plugin_path=$prefix
         vt_load_plugin $vt_plugin_path
@@ -1298,12 +1410,15 @@ else
         set vtoy_path=($root)/ventoy
     fi
 
+    set vtoydev=$vtoy_dev
     set vtoy_iso_part=($vtoy_dev,1)
     set vtoy_efi_part=($vtoy_dev,2)
     loadfont unicode
     set vt_plugin_path=$vtoy_iso_part
 fi
 
+#Load Partition Table
+vt_load_part_table $vtoydev
 
 #Load Plugin
 if [ -f $vtoy_iso_part/ventoy/ventoy.json ]; then
@@ -1331,19 +1446,22 @@ fi
 
 if [ $VTOY_DEFAULT_MENU_MODE -eq 0 ]; then
     set VTOY_F3_CMD="vt_dynamic_menu 1 1"
-    set VTOY_HOTKEY_TIP="F1:Memdisk  F2:Power  F3:TreeView  F4:Localboot  F5:Debug  F6:ExMenu"
+    set VTOY_HOTKEY_TIP="F1:Memdisk  F2:Power  F3:TreeView  F4:Localboot  F5:Tools  F6:ExMenu"
 else
     set VTOY_F3_CMD="vt_dynamic_menu 1 0"
-    set VTOY_HOTKEY_TIP="F1:Memdisk  F2:Power  F3:ListView  F4:Localboot  F5:Debug  F6:ExMenu"
+    set VTOY_HOTKEY_TIP="F1:Memdisk  F2:Power  F3:ListView  F4:Localboot  F5:Tools  F6:ExMenu"
 fi
 
 
 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
 
+
 if [ "$vtoy_display_mode" = "CLI" ]; then
     terminal_output  console
 elif [ "$vtoy_display_mode" = "serial" ]; then
@@ -1367,15 +1485,26 @@ else
     terminal_output  gfxterm
 fi
 
+
+if [ -n "$VTOY_PLUGIN_SYNTAX_ERROR" ]; then
+    clear
+    echo -e "\n Syntax error detected in ventoy.json, please check! \n"
+    echo -e " ventoy.json 文件中有语法错误，所有配置都不会生效，请检查！\n"
+    echo -e "\n press ENTER to continue (请按 回车 键继续) ..."
+    read vtInputKey 
+fi
+
 #export necessary variable
 export theme
 export gfxmode
-export vtoy_dev
+export gfxpayload
+export vtoydev
+export vtoy_path
+export vtdebug_flag
 export vtoy_iso_part
 export vtoy_efi_part
 export VENTOY_VERSION
-
-
+export VTOY_CUR_VIDEO_MODE
 
 
 #colect all image files (iso files)