update for new release

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

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index 92657044dfd7958dae14b6765e044cd563eba577..91ec7e06e383c7fb7d381ad18c16ce3028ea2218 100644 (file)
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -16,40 +16,127 @@
 # 
 #************************************************************************************
 
 # 
 #************************************************************************************
 

+function ventoy_pause {
+    if [ -n "${vtdebug_flag}" ]; then
+        echo "press Enter to continue ......"
+        read vtTmpPause
+    fi
+}
+
+function ventoy_debug_pause {
+    if [ -n "${vtdebug_flag}" ]; then
+        echo "press Enter to continue ......"
+        read vtTmpPause
+    fi
+}
+
+function ventoy_cli_console {      
+    if [ "$grub_platform" = "pc" ]; then
+        #terminal_output  vga_text
+        terminal_output  console
+    else
+        if [ "$vtoy_display_mode" != "CLI" ]; then
+            terminal_output  console
+        fi
+    fi
+}
+
+function ventoy_gui_console {  
+    if [ "$grub_platform" = "pc" ]; then
+        if [ "$vtoy_display_mode" = "CLI" ]; then
+            terminal_output  console
+        else
+            terminal_output  gfxterm
+        fi
+    else
+        if [ "$vtoy_display_mode" != "CLI" ]; then
+            terminal_output  gfxterm
+        fi
+    fi
+}
+
+function ventoy_power {
+    configfile $prefix/power.cfg
+}
+
+function ventoy_diagnosis {    
+    configfile $prefix/debug.cfg
+}
+
+function ventoy_localboot {    
+    configfile $prefix/localboot.cfg
+}
+
+function ventoy_ext_menu {    
+    #if [ -e $vt_plugin_path/ventoy/ventoy_grub.cfg ]; then
+        set ventoy_new_context=1
+        configfile $vt_plugin_path/ventoy/ventoy_grub.cfg
+        unset ventoy_new_context
+    #else
+    #    echo "ventoy_grub.cfg NOT exist."
+    #    echo -e "\npress ENTER to exit ..."
+    #    read vtInputKey
+    #fi
+}
+

 function get_os_type {
 function get_os_type {

-    set vtoy_os=Linux    
-    for file in "efi/microsoft" "sources/boot.wim" "boot/bcd" "bootmgr.efi" "boot/etfsboot.com"; do
-        if [ -e $1/$file ]; then
+    set vtoy_os=Linux
+    
+    for file in "efi/microsoft/boot/bcd" "sources/boot.wim" "boot/bcd" "bootmgr.efi" "boot/etfsboot.com" ; do        
+        if vt_file_exist_nocase (loop)/$file; then        

             set vtoy_os=Windows
             break
         fi
     done
             set vtoy_os=Windows
             break
         fi
     done

-    
+

     if [ -n "${vtdebug_flag}" ]; then
         echo ISO is $vtoy_os
     fi
 }
 
     if [ -n "${vtdebug_flag}" ]; then
         echo ISO is $vtoy_os
     fi
 }
 

+function vt_check_compatible_pe {
+    #Check for PE without external tools
+    if [ -f $1/HBCD_PE.ini ]; then
+        set ventoy_compatible=YES        
+    fi
+}
+

 function locate_initrd {
     vt_linux_locate_initrd 
 
 function locate_initrd {
     vt_linux_locate_initrd 
 

-    if [ -n "${vtdebug_flag}" ]; then
+    if [ -n "${vtdebug_flag}" ]; then        

         vt_linux_dump_initrd
         vt_linux_dump_initrd

-        sleep 5
+        ventoy_debug_pause

     fi
 }
 
     fi
 }
 

-function find_wim_file {
-    unset ventoy_wim_file
+function locate_wim {
+    vt_windows_locate_wim_patch (loop)

     
     

-    for file in "sources/boot.wim" "sources/BOOT.WIM" "Sources/Win10PEx64.WIM" "boot/BOOT.WIM" "winpe_x64.wim"; do
-        if [ -e $1/$file ]; then
-            set ventoy_wim_file=$1/$file
-            break
-        fi
-    done
+    if [ -n "${vtdebug_flag}" ]; then
+        echo '###############################################'
+        vt_dump_wim_patch
+        echo '###############################################'
+        ventoy_debug_pause
+    fi
+}
+
+function distro_specify_wim_patch {
+    if [ -d (loop)/h3pe ]; then
+        vt_windows_collect_wim_patch wim /BOOT/H3_10PE.WIM
+        vt_windows_collect_wim_patch wim /BOOT/H3_7PE.WIM
+        vt_windows_collect_wim_patch wim /BOOT/H3_8PE.WIM
+        vt_windows_collect_wim_patch wim /BOOT/H3_81PE.WIM
+    fi

 }
 
 }
 

+function distro_specify_wim_patch_phase2 {
+    if [ -f (loop)/boot/boot.wim ]; then
+        vt_windows_collect_wim_patch wim /boot/boot.wim
+    fi
+}
+
+

 function distro_specify_initrd_file {
     if [ -e (loop)/boot/all.rdz ]; then
         vt_linux_specify_initrd_file /boot/all.rdz
 function distro_specify_initrd_file {
     if [ -e (loop)/boot/all.rdz ]; then
         vt_linux_specify_initrd_file /boot/all.rdz


@@ -74,54 +161,118 @@ function distro_specify_initrd_file {
         vt_linux_specify_initrd_file /pmagic/initrd.img
     elif [ -e (loop)/boot/initrd.xz ]; then
         vt_linux_specify_initrd_file /boot/initrd.xz
         vt_linux_specify_initrd_file /pmagic/initrd.img
     elif [ -e (loop)/boot/initrd.xz ]; then
         vt_linux_specify_initrd_file /boot/initrd.xz

+    elif [ -f (loop)/boot/initrd ]; then
+        vt_linux_specify_initrd_file /boot/initrd
+    elif [ -f (loop)/boot/x86_64/loader/initrd ]; then
+        vt_linux_specify_initrd_file /boot/x86_64/loader/initrd
+    elif [ -f (loop)/boot/initramfs-x86_64.img ]; then
+        vt_linux_specify_initrd_file /boot/initramfs-x86_64.img
+        
+
+    fi
+}
+
+
+function distro_specify_initrd_file_phase2 {
+    if [ -f (loop)/boot/initrd.img ]; then
+        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
+    elif [ -f (loop)/live/initrd.img ]; then 
+        vt_linux_specify_initrd_file /live/initrd.img
+    elif [ -f (loop)/initrd.img ]; then 
+        vt_linux_specify_initrd_file /initrd.img
+    elif [ -f (loop)/sysresccd/boot/x86_64/sysresccd.img ]; then 
+        vt_linux_specify_initrd_file /sysresccd/boot/x86_64/sysresccd.img
+    elif [ -f (loop)/CDlinux/initrd ]; then 
+        vt_linux_specify_initrd_file /CDlinux/initrd
+    elif [ -f (loop)/parabola/boot/x86_64/parabolaiso.img ]; then 
+        vt_linux_specify_initrd_file /parabola/boot/x86_64/parabolaiso.img
+        if [ -f (loop)/parabola/boot/i686/parabolaiso.img ]; then 
+            vt_linux_specify_initrd_file /parabola/boot/i686/parabolaiso.img
+        fi
+    elif [ -f (loop)/EFI/BOOT/initrd.img ]; then 
+        #Qubes
+        vt_linux_specify_initrd_file /EFI/BOOT/initrd.img
+        if [ "$grub_platform" != "pc" ]; then
+            vt_add_replace_file 0 "initrd.img"    
+        fi
+    elif [ -f (loop)/initrd ]; then 
+        vt_linux_specify_initrd_file /initrd
+    elif [ -f (loop)/live/initrd1 ]; then 
+        vt_linux_specify_initrd_file /live/initrd1
+        

     fi
 }
 
 function uefi_windows_menu_func {
     vt_windows_reset
     fi
 }
 
 function uefi_windows_menu_func {
     vt_windows_reset

-    
-    if [ "$ventoy_compatible" = "NO" ]; then        
-        find_wim_file (loop)
-        if [ -n "$ventoy_wim_file" ]; then
-            vt_windows_locate_wim $ventoy_wim_file
+
+    if [ "$ventoy_compatible" = "NO" ]; then   
+        
+        if [ "$ventoy_fs_probe" = "iso9660" ]; then
+            loopback -d loop
+            vt_iso9660_nojoliet 1            
+            loopback loop $1$2

         fi
         fi

-    fi
-    
-    vt_windows_chain_data ${1}${chosen_path}
+        
+        for file in "efi/microsoft/boot/bcd"; do
+            vt_windows_collect_wim_patch bcd (loop)/$file                
+        done

 
 

-    if [ -n "${vtdebug_flag}" ]; then
-        sleep 5
+        vt_windows_count_wim_patch vt_wim_cnt
+        if [ $vt_wim_cnt -eq 0 ]; then
+            distro_specify_wim_patch_phase2
+        fi
+        
+        ventoy_debug_pause        
+        locate_wim

     fi
 
     fi
 

+    vt_windows_chain_data ${1}${chosen_path}    
+    ventoy_debug_pause
+    

     if [ -n "$vtoy_chain_mem_addr" ]; then
     if [ -n "$vtoy_chain_mem_addr" ]; then

-        terminal_output  console       
+        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
     else
         echo "chain empty failed"
         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
     else
         echo "chain empty failed"

-        sleep 5
+        ventoy_pause

     fi
 }
 
 function uefi_linux_menu_func {
     if [ "$ventoy_compatible" = "NO" ]; then    
     fi
 }
 
 function uefi_linux_menu_func {
     if [ "$ventoy_compatible" = "NO" ]; then    

-        vt_load_cpio  ${vtoy_path}/ventoy.cpio
+        
+        if [ "$ventoy_fs_probe" = "udf" ]; then
+            loopback -d loop            
+            set ventoy_fs_probe=iso9660
+            loopback loop $1$2
+        fi
+        
+        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
 
         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
         fi
                     vt_linux_parse_initrd_grub  file  (loop)/$file
                 fi
             done
         fi

-        
+

         # special process for special distros
         if [ -d (loop)/loader/entries ]; then
         # special process for special distros
         if [ -d (loop)/loader/entries ]; then

-            set LoadIsoEfiDriver=on

             vt_linux_parse_initrd_grub  dir  (loop)/loader/entries/
         elif [ -d (loop)/boot/grub ]; then
             vt_linux_parse_initrd_grub  dir  (loop)/boot/grub/
             vt_linux_parse_initrd_grub  dir  (loop)/loader/entries/
         elif [ -d (loop)/boot/grub ]; then
             vt_linux_parse_initrd_grub  dir  (loop)/boot/grub/


@@ -129,18 +280,53 @@ function uefi_linux_menu_func {
         
         distro_specify_initrd_file
         
         
         distro_specify_initrd_file
         

+        vt_linux_initrd_count vtcount
+        if [ $vtcount -eq 0 ]; then
+            distro_specify_initrd_file_phase2
+            
+            if [ "$vt_efi_dir" = "NO" ]; then
+                if [ -f (loop)/efi.img ];  then
+                    vt_add_replace_file 0 "initrd"
+                fi
+            fi
+        fi
+        

         locate_initrd
         locate_initrd

+        
+        if [ -d (loop)/loader/entries ]; then
+            vt_linux_get_main_initrd_index vtindex
+            
+            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)/boot/initramfs_x86_64.img ]; then
+                    vt_add_replace_file $vtindex "boot\\initramfs_x86_64.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
+                vt_add_replace_file $vtindex "boot\\initrd"
+            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'
+        fi
+        

     fi
     
     vt_linux_chain_data ${1}${chosen_path}
 
     if [ -n "$vtoy_chain_mem_addr" ]; then
     fi
     
     vt_linux_chain_data ${1}${chosen_path}
 
     if [ -n "$vtoy_chain_mem_addr" ]; then

-        terminal_output  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}
+        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
     else
         echo "chain empty failed"
         boot
     else
         echo "chain empty failed"

-        sleep 5
+        ventoy_pause

     fi
 }
 
     fi
 }
 


@@ -154,27 +340,38 @@ function uefi_iso_menu_func {
     if [ -n "$vtisouefi" ]; then
         set LoadIsoEfiDriver=on
         unset vtisouefi
     if [ -n "$vtisouefi" ]; then
         set LoadIsoEfiDriver=on
         unset vtisouefi

-    elif [ -n "$VTOY_ISO_UEFI_DRV" ]; then
+    elif vt_check_mode 2; then

         set LoadIsoEfiDriver=on
     else
         unset LoadIsoEfiDriver
     fi
 
     vt_chosen_img_path chosen_path
         set LoadIsoEfiDriver=on
     else
         unset LoadIsoEfiDriver
     fi
 
     vt_chosen_img_path chosen_path

+    vt_select_auto_install ${chosen_path}
+    vt_select_persistence ${chosen_path}

 
     if vt_is_udf ${1}${chosen_path}; then
         set ventoy_fs_probe=udf
     else
         set ventoy_fs_probe=iso9660
 
     if vt_is_udf ${1}${chosen_path}; then
         set ventoy_fs_probe=udf
     else
         set ventoy_fs_probe=iso9660

+        vt_iso9660_nojoliet 0

     fi
 
     loopback loop ${1}${chosen_path}
     get_os_type (loop)
     
     fi
 
     loopback loop ${1}${chosen_path}
     get_os_type (loop)
     

+    if [ -d (loop)/EFI ]; then
+        set vt_efi_dir=YES
+    elif [ -d (loop)/efi ]; then
+        set vt_efi_dir=YES
+    else
+        set vt_efi_dir=NO
+    fi
+    

     if [ -n "$vtcompat" ]; then
         set ventoy_compatible=YES
         unset vtcompat
     if [ -n "$vtcompat" ]; then
         set ventoy_compatible=YES
         unset vtcompat

-    elif [ -n "$VTOY_ISO_RAW" ]; then
+    elif vt_check_mode 1; then

         set ventoy_compatible=YES
     else
         vt_check_compatible (loop)
         set ventoy_compatible=YES
     else
         vt_check_compatible (loop)


@@ -183,16 +380,13 @@ function uefi_iso_menu_func {
     vt_img_sector ${1}${chosen_path}
     
     if [ "$vtoy_os" = "Windows" ]; then
     vt_img_sector ${1}${chosen_path}
     
     if [ "$vtoy_os" = "Windows" ]; then

-        if [ "$ventoy_fs_probe" = "iso9660" ]; then
-            set ventoy_compatible=YES
-        fi
-    
-        uefi_windows_menu_func  $1
+        vt_check_compatible_pe (loop)        
+        uefi_windows_menu_func  $1 ${chosen_path}

     else
     else

-        uefi_linux_menu_func  $1
+        uefi_linux_menu_func  $1 ${chosen_path}

     fi
 
     fi
 

-    terminal_output  gfxterm    
+    ventoy_gui_console

 }
 
 function uefi_iso_memdisk {    
 }
 
 function uefi_iso_memdisk {    


@@ -201,47 +395,62 @@ function uefi_iso_memdisk {
     echo 'Loading ISO file to memory ...'
     vt_load_iso_to_mem ${1}${chosen_path} vtoy_iso_buf
     
     echo 'Loading ISO file to memory ...'
     vt_load_iso_to_mem ${1}${chosen_path} vtoy_iso_buf
     

-    terminal_output  console
+    ventoy_cli_console

     chainloader ${vtoy_path}/ventoy_x64.efi memdisk env_param=${env_param} isoefi=${LoadIsoEfiDriver} ${vtdebug_flag} mem:${vtoy_iso_buf_addr}:size:${vtoy_iso_buf_size}
     boot
     chainloader ${vtoy_path}/ventoy_x64.efi memdisk env_param=${env_param} isoefi=${LoadIsoEfiDriver} ${vtdebug_flag} mem:${vtoy_iso_buf_addr}:size:${vtoy_iso_buf_size}
     boot

+    
+    ventoy_gui_console

 }
 
 
 }
 
 

-
-
-

 function legacy_windows_menu_func {
     vt_windows_reset
     
 function legacy_windows_menu_func {
     vt_windows_reset
     

-    if [ "$ventoy_compatible" = "NO" ]; then                
-        find_wim_file (loop)
-        if [ -n "$ventoy_wim_file" ]; then
-            vt_windows_locate_wim $ventoy_wim_file
-        elif [ -n "${vtdebug_flag}" ]; then
-            echo No wim file found
+    if [ "$ventoy_compatible" = "NO" ]; then   
+        
+        if [ "$ventoy_fs_probe" = "iso9660" ]; then
+            loopback -d loop
+            vt_iso9660_nojoliet 1
+            loopback loop $1$2

         fi
         fi

+        
+        for file in "boot/bcd" "/efi/microsoft/boot/bcd" "SSTR/BCD"; do
+            vt_windows_collect_wim_patch bcd (loop)/$file                
+        done
+        
+        distro_specify_wim_patch
+
+        vt_windows_count_wim_patch vt_wim_cnt
+        if [ $vt_wim_cnt -eq 0 ]; then
+            distro_specify_wim_patch_phase2
+        fi
+        
+        ventoy_debug_pause        
+        locate_wim

     fi
     fi

-       
-    vt_windows_chain_data ${1}${chosen_path}
-    
-    if [ -n "${vtdebug_flag}" ]; then
-        sleep 5
-    fi
+
+    vt_windows_chain_data ${1}${chosen_path}    
+    ventoy_debug_pause    

     
     if [ -n "$vtoy_chain_mem_addr" ]; then
     
     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"
         boot
     else
         echo "chain empty failed"

-        sleep 5
+        ventoy_pause

     fi
 }
 
 function legacy_linux_menu_func {
     if [ "$ventoy_compatible" = "NO" ]; then
     fi
 }
 
 function legacy_linux_menu_func {
     if [ "$ventoy_compatible" = "NO" ]; then

+
+        if [ "$ventoy_fs_probe" = "udf" ]; then
+            loopback -d loop
+            set ventoy_fs_probe=iso9660
+            loopback loop $1$2
+        fi

     
     

-        vt_load_cpio  $vtoy_path/ventoy.cpio
+        vt_load_cpio  $vtoy_path/ventoy.cpio  $2 $1

 
         vt_linux_clear_initrd
         
 
         vt_linux_clear_initrd
         


@@ -272,22 +481,23 @@ function legacy_linux_menu_func {
         
         distro_specify_initrd_file
         
         
         distro_specify_initrd_file
         

+        vt_linux_initrd_count vtcount
+        if [ $vtcount -eq 0 ]; then
+            distro_specify_initrd_file_phase2
+        fi
+        

         locate_initrd
     fi
     
         locate_initrd
     fi
     

-    vt_linux_chain_data ${1}${chosen_path}
-    
-    if [ -n "${vtdebug_flag}" ]; then
-        sleep 5
-    fi
+    vt_linux_chain_data ${1}${chosen_path}    
+    ventoy_debug_pause

     
     

-    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"
         boot
     else
         echo "chain empty failed"

-        sleep 5
+        ventoy_pause

     fi
 }
 
     fi
 }
 


@@ -298,21 +508,23 @@ function legacy_iso_menu_func {
     fi
 
     vt_chosen_img_path chosen_path
     fi
 
     vt_chosen_img_path chosen_path

+    vt_select_auto_install ${chosen_path}
+    vt_select_persistence ${chosen_path}

 
     if vt_is_udf ${1}${chosen_path}; then
         set ventoy_fs_probe=udf
     else
         set ventoy_fs_probe=iso9660
 
     if vt_is_udf ${1}${chosen_path}; then
         set ventoy_fs_probe=udf
     else
         set ventoy_fs_probe=iso9660

-    fi   
-
-    loopback loop ${1}${chosen_path}
+        vt_iso9660_nojoliet 0
+    fi

     
     

+    loopback loop ${1}${chosen_path}

     get_os_type (loop)
     get_os_type (loop)

-    
+

     if [ -n "$vtcompat" ]; then
         set ventoy_compatible=YES
         unset vtcompat
     if [ -n "$vtcompat" ]; then
         set ventoy_compatible=YES
         unset vtcompat

-    elif [ -n "$VTOY_ISO_RAW" ]; then
+    elif vt_check_mode 1; then

         set ventoy_compatible=YES
     else
         vt_check_compatible (loop)
         set ventoy_compatible=YES
     else
         vt_check_compatible (loop)


@@ -321,12 +533,10 @@ function legacy_iso_menu_func {
     vt_img_sector ${1}${chosen_path}
 
     if [ "$vtoy_os" = "Windows" ]; then
     vt_img_sector ${1}${chosen_path}
 
     if [ "$vtoy_os" = "Windows" ]; then

-        if [ "$ventoy_fs_probe" = "iso9660" ]; then
-            set ventoy_compatible=YES
-        fi
-        legacy_windows_menu_func  $1
+        vt_check_compatible_pe (loop)        
+        legacy_windows_menu_func  $1 ${chosen_path}

     else
     else

-        legacy_linux_menu_func  $1
+        legacy_linux_menu_func  $1 ${chosen_path}

     fi
 }
 
     fi
 }
 


@@ -339,6 +549,72 @@ function legacy_iso_memdisk {
     boot
 }
 
     boot
 }
 

+function iso_common_menuentry {
+    if [ "$grub_platform" = "pc" ]; then
+        if vt_check_mode 0; then
+            legacy_iso_memdisk $vtoy_iso_part
+        else
+            legacy_iso_menu_func $vtoy_iso_part
+        fi
+    else
+        if vt_check_mode 0; then
+            uefi_iso_memdisk $vtoy_iso_part 
+        else
+            uefi_iso_menu_func $vtoy_iso_part                
+        fi
+    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"    
+    echo -e "\npress ENTER to exit (请按 回车 键返回) ..."    
+    read vtInputKey
+}
+
+function iso_unsupport_menuentry {
+    common_unsupport_menuentry
+}
+
+function wim_common_menuentry {
+    vt_chosen_img_path chosen_path
+    vt_wim_chain_data ${vtoy_iso_part}${chosen_path}
+    
+    ventoy_debug_pause    
+    
+    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}
+        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}
+            ventoy_gui_console
+        fi
+        boot
+    else
+        echo "chain empty failed"
+        ventoy_pause
+    fi
+}
+
+function wim_unsupport_menuentry {
+    common_unsupport_menuentry
+}
+
+function efi_common_menuentry {
+    vt_chosen_img_path chosen_path
+    
+    ventoy_cli_console    
+    chainloader ${vtoy_iso_part}${chosen_path}
+    boot
+    ventoy_gui_console
+}
+
+function efi_unsupport_menuentry {
+    common_unsupport_menuentry
+}
+
+

 
 #############################################################
 #############################################################
 
 #############################################################
 #############################################################


@@ -348,81 +624,137 @@ function legacy_iso_memdisk {
 #############################################################
 #############################################################
 
 #############################################################
 #############################################################
 

-set VENTOY_VERSION="1.0.05"
+set VENTOY_VERSION="1.0.16"

 
 

-#disable timeout
-unset timeout
+# Default menu display mode, you can change it as you want.
+#    0: List mode   
+#    1: TreeView mode
+set VTOY_DEFAULT_MENU_MODE=0

 
 

-set VTOY_MEM_DISK_STR="MEMDISK"
-set VTOY_ISO_RAW_STR="ISO RAW"
+set VTOY_MEM_DISK_STR="[Memdisk]"
+set VTOY_ISO_RAW_STR="Compatible Mode"

 set VTOY_ISO_UEFI_DRV_STR="UEFI FS"
 
 set VTOY_ISO_UEFI_DRV_STR="UEFI FS"
 

+set VTOY_F2_CMD="ventoy_power"
+set VTOY_F4_CMD="ventoy_localboot"
+set VTOY_F5_CMD="ventoy_diagnosis"
+set VTOY_F6_CMD="ventoy_ext_menu"
+
+if [ "$grub_platform" = "pc" ]; then
+    set VTOY_TEXT_MENU_VER="Ventoy $VENTOY_VERSION BIOS  www.ventoy.net"
+else
+    set VTOY_TEXT_MENU_VER="Ventoy $VENTOY_VERSION UEFI  www.ventoy.net"
+fi
+

 vt_device $root  vtoy_dev
 
 if [ "$vtoy_dev" = "tftp" ]; then
 vt_device $root  vtoy_dev
 
 if [ "$vtoy_dev" = "tftp" ]; then

-    set vtoy_path=($root)    
+    set vtoy_path=($root)

     for vtid in 0 1 2 3; do
         if [ -d (hd$vtid,2)/ventoy ]; then
     for vtid in 0 1 2 3; do
         if [ -d (hd$vtid,2)/ventoy ]; then

-            set iso_path=(hd$vtid,1)
+            set vtoy_iso_part=(hd$vtid,1)
+            set vtoy_efi_part=(hd$vtid,2)

             break
         fi
     done
             break
         fi
     done

+    loadfont ascii
+
+    if [ -f $vtoy_iso_part/ventoy/ventoy.json ]; then
+       set vt_plugin_path=$vtoy_iso_part
+    else
+        set vt_plugin_path=$prefix
+        vt_load_plugin $vt_plugin_path
+    fi

 else
 else

-    set vtoy_path=($root)/ventoy    
-    set iso_path=($vtoy_dev,1)
+    if [ "$prefix" = "(ventoydisk)/grub" ]; then
+        set vtoy_path=(ventoydisk)/ventoy
+    else
+        set vtoy_path=($root)/ventoy
+    fi
+
+    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 Plugin
+if [ -f $vtoy_iso_part/ventoy/ventoy.json ]; then
+   vt_load_plugin $vtoy_iso_part

 fi
 
 fi
 

-loadfont ascii
+if [ -n "$VTOY_MENU_TIMEOUT" ]; then
+    set timeout=$VTOY_MENU_TIMEOUT
+else
+    unset timeout
+fi

 
 

-if [ -f $iso_path/ventoy/ventoy.json ]; then
-   vt_load_plugin $iso_path
+if [ -f $vtoy_iso_part/ventoy/ventoy_wimboot.img ]; then
+    vt_load_wimboot $vtoy_iso_part/ventoy/ventoy_wimboot.img
+elif [ -f $vtoy_efi_part/ventoy/ventoy_wimboot.img ]; then
+    vt_load_wimboot $vtoy_efi_part/ventoy/ventoy_wimboot.img

 fi
 
 fi
 

-terminal_output  gfxterm

 
 

-if [ -n "$vtoy_theme" ]; then
-    set theme=$vtoy_theme
+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"

 else
 else

-    set theme=$prefix/themes/ventoy/theme.txt
+    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"

 fi
 
 fi
 

+

 if [ -n "$vtoy_gfxmode" ]; then
     set gfxmode=$vtoy_gfxmode
 else
 if [ -n "$vtoy_gfxmode" ]; then
     set gfxmode=$vtoy_gfxmode
 else

-    set gfxmode=1024x768
+    set gfxmode=1920x1080,1366x768,1024x768
+fi
+
+if [ "$vtoy_display_mode" = "CLI" ]; then
+    terminal_output  console
+else    
+    if [ -n "$vtoy_theme" ]; then
+        set theme=$vtoy_theme
+    else
+        set theme=$prefix/themes/ventoy/theme.txt
+    fi
+    terminal_output  gfxterm

 fi
 
 fi
 

+#export necessary variable
+export theme
+export gfxmode
+export vtoy_dev
+export vtoy_iso_part
+export vtoy_efi_part
+export VENTOY_VERSION
+
+
+
+

 #colect all image files (iso files)
 set ventoy_img_count=0
 #colect all image files (iso files)
 set ventoy_img_count=0

-vt_list_img $iso_path ventoy_img_count
-
-#Dynamic menu for every iso file
-if vt_cmp $ventoy_img_count ne 0; then
-    set imgid=0
-    while vt_cmp $imgid lt $ventoy_img_count; do       
-        vt_img_name $imgid img_name
-        menuentry "$img_name" {  
-            if [ "$grub_platform" = "pc" ]; then
-                if [ -n "$VTOY_MEM_DISK" ]; then
-                    legacy_iso_memdisk $iso_path
-                else
-                    legacy_iso_menu_func $iso_path
-                fi
-            else
-                if [ -n "$VTOY_MEM_DISK" ]; then
-                    uefi_iso_memdisk $iso_path 
-                else
-                    uefi_iso_menu_func $iso_path                
-                fi
-            fi            
-        }
-        
-        vt_incr imgid 1
-    done
+vt_list_img $vtoy_iso_part ventoy_img_count
+
+#Main menu
+if [ $ventoy_img_count -gt 0 ]; then
+    if [ $VTOY_DEFAULT_MENU_MODE -eq 0 ]; then
+        vt_dynamic_menu 0 0 
+    else
+        vt_dynamic_menu 0 1
+    fi

 else
 else

-    menuentry "No ISO files found (Press enter to reboot ...)" {
+    if [ -n "$VTOY_NO_ISO_TIP" ]; then
+        NO_ISO_MENU="No ISO files found, $VTOY_NO_ISO_TIP"
+    elif [ -n "$VTOY_DEFAULT_SEARCH_ROOT" ]; then
+        NO_ISO_MENU="No ISO files found, please check VTOY_DEFAULT_SEARCH_ROOT"
+    else
+        NO_ISO_MENU="No ISO files found"
+    fi
+    menuentry "$NO_ISO_MENU (Press enter to reboot ...)" {

         echo -e "\n    Rebooting ... "
         reboot
     }
 fi
         echo -e "\n    Rebooting ... "
         reboot
     }
 fi

-