]> glassweightruler.freedombox.rocks Git - Ventoy.git/blobdiff - INSTALL/grub/grub.cfg
1.0.21 release
[Ventoy.git] / INSTALL / grub / grub.cfg
index 9bc92b77d7a9d20187a70371f37d3281a319a65f..a7a0caeaa7647f088bcaea21d693385fa4107dc5 100644 (file)
@@ -48,7 +48,8 @@ function ventoy_power {
     configfile $prefix/power.cfg
 }
 
-function ventoy_diagnosis {    
+function ventoy_diagnosis {
+    vt_enum_video_mode    
     configfile $prefix/debug.cfg
 }
 
@@ -505,6 +506,10 @@ function uefi_linux_menu_func {
             elif [ -f (loop)/hyperbola/boot/x86_64/hyperiso.img ]; then
                 vt_add_replace_file 0 "EFI\\hyperiso\\hyperiso.img"
             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"            
+            fi
         elif [ -e (loop)/syslinux/alt0/full.cz ]; then
             vt_add_replace_file 0 "EFI\\BOOT\\full.cz"            
             set FirstTryBootFile='@EFI@BOOT@grubx64.efi'
@@ -642,6 +647,8 @@ function legacy_windows_menu_func {
     
     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
         boot
     else
         echo "chain empty failed"
@@ -855,6 +862,21 @@ function iso_common_menuentry {
     fi      
 }
 
+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
+        uefi_iso_memdisk $vtoy_iso_part  $vt_chosen_path
+    fi      
+}
+
+
 function common_unsupport_menuentry {
     echo -e "\n The name of the iso file could NOT contain space or non-ascii characters. \n"
     echo -e " 文件名中不能有中文或空格 \n"    
@@ -862,6 +884,10 @@ function common_unsupport_menuentry {
     read vtInputKey
 }
 
+function miso_unsupport_menuentry {
+    common_unsupport_menuentry
+}
+
 function iso_unsupport_menuentry {
     common_unsupport_menuentry
 }
@@ -875,6 +901,8 @@ 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
         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}
@@ -917,6 +945,48 @@ function efi_unsupport_menuentry {
     common_unsupport_menuentry
 }
 
+
+function vhd_common_menuentry {
+
+    if [ "$VTOY_VHD_NO_WARNING" != "1" ]; then
+        if [ "$vtoy_iso_fs" != "ntfs" ]; then
+            echo -e "!!! WARNING !!!\n"
+            echo -e "\nPartition1 ($vtoy_iso_fs) is NOT ntfs, the VHD(x) file may not boot normally \n"
+            echo -e "\nVHD(x) 文件所在分区不是 ntfs 格式, 可能无法正常启动 \n\n"
+            echo -n "press ENTER to continue boot (请按 回车 键继续) ..."    
+            read vtInputKey
+        fi
+    fi
+
+    vt_chosen_img_path vt_chosen_path vt_chosen_size
+    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
+            boot
+        else
+            ventoy_cli_console
+            chainloader ${vtoy_path}/ventoy_x64.efi memdisk env_param=${env_param} isoefi=${LoadIsoEfiDriver} ${vtdebug_flag} mem:${vtoy_vhd_buf_addr}:size:${vtoy_vhd_buf_size}
+            boot
+            ventoy_gui_console
+        fi        
+    else
+        echo "Failed to boot vhd file"
+        ventoy_pause
+    fi
+}
+
+function vhd_unsupport_menuentry {
+    common_unsupport_menuentry
+}
+
 #
 #============================================================#
 # IMG file boot process                                      #
@@ -1185,7 +1255,7 @@ function img_unsupport_menuentry {
 #############################################################
 #############################################################
 
-set VENTOY_VERSION="1.0.20"
+set VENTOY_VERSION="1.0.21"
 
 # Default menu display mode, you can change it as you want.
 #    0: List mode   
@@ -1212,9 +1282,10 @@ 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
@@ -1233,12 +1304,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
@@ -1257,20 +1331,28 @@ elif [ -f $vtoy_efi_part/ventoy/ventoy_wimboot.img ]; then
     vt_load_wimboot $vtoy_efi_part/ventoy/ventoy_wimboot.img
 fi
 
+if [ -f $vtoy_iso_part/ventoy/ventoy_vhdboot.img ]; then
+    vt_load_vhdboot $vtoy_iso_part/ventoy/ventoy_vhdboot.img
+elif [ -f $vtoy_efi_part/ventoy/ventoy_vhdboot.img ]; then
+    vt_load_vhdboot $vtoy_efi_part/ventoy/ventoy_vhdboot.img
+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
+    set gfxmode=1920x1080,1366x768,1024x768,800x600,auto    
+    set gfxpayload=keep
 fi
 
 if [ "$vtoy_display_mode" = "CLI" ]; then
@@ -1299,10 +1381,11 @@ fi
 #export necessary variable
 export theme
 export gfxmode
-export vtoy_dev
+export vtoydev
 export vtoy_iso_part
 export vtoy_efi_part
 export VENTOY_VERSION
+export VTOY_CUR_VIDEO_MODE