X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/9f57cb392969d5be08c7d30235406f5569883cd4..e80871a31e882fb3e5dfd6c791f078588be97c33:/INSTALL/grub/grub.cfg

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index be1697a..ab18f8d 100644
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -38,7 +38,7 @@ function ventoy_power {
 
 function get_os_type {
     set vtoy_os=Linux    
-    for file in "efi/microsoft" "sources/boot.wim" "boot/bcd" "bootmgr.efi" "boot/etfsboot.com"; do
+    for file in "efi/microsoft" "sources/boot.wim" "boot/bcd" "bootmgr.efi" "boot/etfsboot.com" "BOOT/etfsboot.com"; do
         if [ -e $1/$file ]; then
             set vtoy_os=Windows
             break
@@ -50,6 +50,21 @@ function get_os_type {
     fi
 }
 
+function vt_check_pe {
+    unset VT_PE_SUPPORT
+
+    if [ -f $1/HBCD_PE.ini ]; then
+        set ventoy_compatible=YES
+        set VT_PE_SUPPORT=YES
+    elif [ -f $1/easyu.flg ]; then
+        set VT_PE_SUPPORT=YES
+    elif [ -f $1/USM.ICO ]; then
+        set VT_PE_SUPPORT=YES
+    elif [ -d $1/USM_TOOL ]; then
+        set VT_PE_SUPPORT=YES
+    fi
+}
+
 function locate_initrd {
     vt_linux_locate_initrd 
 
@@ -62,7 +77,8 @@ function locate_initrd {
 function find_wim_file {
     unset ventoy_wim_file
     
-    for file in "sources/boot.wim" "sources/BOOT.WIM" "Sources/Win10PEx64.WIM" "boot/BOOT.WIM" "winpe_x64.wim"; do
+    for file in "sources/boot.wim" "sources/BOOT.WIM" "Sources/Win10PEx64.WIM" "boot/BOOT.WIM" \
+                "winpe_x64.wim" "boot/10pex64.wim" "BOOT/USM1PE6L.WIM" "BOOT/USM1PE6F.WIM"; do
         if [ -e $1/$file ]; then
             set ventoy_wim_file=$1/$file
             break
@@ -110,6 +126,12 @@ function distro_specify_initrd_file_phase2 {
         vt_linux_specify_initrd_file /boot/initrd.img
     elif [ -f (loop)/Setup/initrd.gz ]; then
         vt_linux_specify_initrd_file /Setup/initrd.gz
+    elif [ -f (loop)/isolinux/initramfs ]; then
+        vt_linux_specify_initrd_file /isolinux/initramfs
+    elif [ -f (loop)/boot/iniramfs.igz ]; then
+        vt_linux_specify_initrd_file /boot/iniramfs.igz
+    elif [ -f (loop)/initrd-x86_64 ]; then
+        vt_linux_specify_initrd_file /initrd-x86_64
         
     fi
 }
@@ -142,15 +164,15 @@ function uefi_windows_menu_func {
 
 function uefi_linux_menu_func {
     if [ "$ventoy_compatible" = "NO" ]; then    
-        vt_load_cpio  ${vtoy_path}/ventoy.cpio
+        vt_load_cpio  ${vtoy_path}/ventoy.cpio   $2 $1
 
         vt_linux_clear_initrd
         
         if [ -d (loop)/pmagic ]; then
             vt_linux_specify_initrd_file /pmagic/initrd.img
         else
-            for file in "boot/grub/grub.cfg" "EFI/BOOT/grub.cfg" "EFI/boot/grub.cfg" "efi/boot/grub.cfg" "EFI/BOOT/BOOTX64.conf"; do
-                if [ -e (loop)/$file ]; then
+            for file in "boot/grub/grub.cfg" "EFI/BOOT/grub.cfg" "EFI/boot/grub.cfg" "efi/boot/grub.cfg" "EFI/BOOT/BOOTX64.conf" "/grub/grub.cfg"; do
+                if [ -e (loop)/$file ]; then                    
                     vt_linux_parse_initrd_grub  file  (loop)/$file
                 fi
             done
@@ -244,15 +266,16 @@ function uefi_iso_menu_func {
     vt_img_sector ${1}${chosen_path}
     
     if [ "$vtoy_os" = "Windows" ]; then
-        if [ "$ventoy_fs_probe" = "iso9660" ]; then
-            set ventoy_compatible=YES
-        elif [ -f (loop)/HBCD_PE.ini ]; then
-            set ventoy_compatible=YES
+        vt_check_pe (loop)        
+        if [ "$VT_PE_SUPPORT" != "YES" ]; then
+            if [ "$ventoy_fs_probe" = "iso9660" ]; then        
+                set ventoy_compatible=YES
+            fi
         fi
     
-        uefi_windows_menu_func  $1
+        uefi_windows_menu_func  $1 ${chosen_path}
     else
-        uefi_linux_menu_func  $1
+        uefi_linux_menu_func  $1 ${chosen_path}
     fi
 
     terminal_output  gfxterm    
@@ -289,8 +312,7 @@ function legacy_windows_menu_func {
     fi
     
     if [ -n "$vtoy_chain_mem_addr" ]; then
-        linux16   $vtoy_path/ipxe.krn ${vtdebug_flag} ibft
-        initrd16  mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}        
+        linux16   $vtoy_path/ipxe.krn ${vtdebug_flag} ibft mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
         boot
     else
         echo "chain empty failed"
@@ -300,8 +322,7 @@ function legacy_windows_menu_func {
 
 function legacy_linux_menu_func {
     if [ "$ventoy_compatible" = "NO" ]; then
-    
-        vt_load_cpio  $vtoy_path/ventoy.cpio
+        vt_load_cpio  $vtoy_path/ventoy.cpio  $2 $1
 
         vt_linux_clear_initrd
         
@@ -346,9 +367,8 @@ function legacy_linux_menu_func {
         sleep 5
     fi
     
-    if [ -n "$vtoy_chain_mem_addr" ]; then        
-        linux16   $vtoy_path/ipxe.krn ${vtdebug_flag}
-        initrd16  mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}        
+    if [ -n "$vtoy_chain_mem_addr" ]; then
+        linux16   $vtoy_path/ipxe.krn ${vtdebug_flag}  mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
         boot
     else
         echo "chain empty failed"
@@ -386,15 +406,16 @@ function legacy_iso_menu_func {
     vt_img_sector ${1}${chosen_path}
 
     if [ "$vtoy_os" = "Windows" ]; then
-        if [ "$ventoy_fs_probe" = "iso9660" ]; then
-            set ventoy_compatible=YES
-        elif [ -f (loop)/HBCD_PE.ini ]; then
-            set ventoy_compatible=YES
+        vt_check_pe (loop)        
+        if [ "$VT_PE_SUPPORT" != "YES" ]; then
+            if [ "$ventoy_fs_probe" = "iso9660" ]; then        
+                set ventoy_compatible=YES
+            fi
         fi
         
-        legacy_windows_menu_func  $1
+        legacy_windows_menu_func  $1 ${chosen_path}
     else
-        legacy_linux_menu_func  $1
+        legacy_linux_menu_func  $1 ${chosen_path}
     fi
 }
 
@@ -432,7 +453,12 @@ function common_menuentry {
 #############################################################
 #############################################################
 
-set VENTOY_VERSION="1.0.08"
+set VENTOY_VERSION="1.0.10"
+
+# Default menu display mode, you can change it as you want.
+#    0: List mode   
+#    1: TreeView mode
+set VTOY_DEFAULT_MENU_MODE=0
 
 #disable timeout
 unset timeout
@@ -442,9 +468,7 @@ set VTOY_ISO_RAW_STR="ISO RAW"
 set VTOY_ISO_UEFI_DRV_STR="UEFI FS"
 
 set VTOY_F2_CMD="ventoy_power"
-set VTOY_F3_CMD="vt_dynamic_menu tree"
 
-set VTOY_HOTKEY_TIP="F1:Memdisk  F2:Power  F3:TreeView"
 if [ "$grub_platform" = "pc" ]; then
     set VTOY_TEXT_MENU_VER="Ventoy $VENTOY_VERSION BIOS  www.ventoy.net"
 else
@@ -468,10 +492,21 @@ fi
 
 loadfont ascii
 
+#Load Plugin
 if [ -f $iso_path/ventoy/ventoy.json ]; then
    vt_load_plugin $iso_path
 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"
+else
+    set VTOY_F3_CMD="vt_dynamic_menu 1 0"
+    set VTOY_HOTKEY_TIP="F1:Memdisk  F2:Power  F3:ListView"
+fi
+
+
 if [ -n "$vtoy_gfxmode" ]; then
     set gfxmode=$vtoy_gfxmode
 else
@@ -492,7 +527,11 @@ vt_list_img $iso_path ventoy_img_count
 
 #Main menu
 if [ $ventoy_img_count -gt 0 ]; then
-    vt_dynamic_menu
+    if [ $VTOY_DEFAULT_MENU_MODE -eq 0 ]; then
+        vt_dynamic_menu 0 0 
+    else
+        vt_dynamic_menu 0 1
+    fi
 else
     menuentry "No ISO files found (Press enter to reboot ...)" {
         echo -e "\n    Rebooting ... "