X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/c8e86938feedfcdb089a26cc18d476ead303d50e..4cb9134e5c8be0dce3fd74ecffc08ff5cb4ffe9f:/INSTALL/grub/grub.cfg?ds=inline diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg index 2a2175d..64fe729 100644 --- a/INSTALL/grub/grub.cfg +++ b/INSTALL/grub/grub.cfg @@ -16,60 +16,135 @@ # #************************************************************************************ +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 ${vtoy_path}/grub/power.cfg + 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 { - set vtoy_os=Linux - 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=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 - + + if [ "$vtoy_os" = "Linux" ]; then + if vt_strstr "$vt_system_id" "FreeBSD"; then + set vtoy_os=Unix + elif [ -e (loop)/bin/freebsd-version ]; then + set vtoy_os=Unix + fi + fi + if [ -n "${vtdebug_flag}" ]; then echo ISO is $vtoy_os fi } -function vt_check_pe { - unset VT_PE_SUPPORT - +function vt_check_compatible_pe { + #Check for PE without external tools 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 + set ventoy_compatible=YES fi } function locate_initrd { vt_linux_locate_initrd - if [ -n "${vtdebug_flag}" ]; then + if [ -n "${vtdebug_flag}" ]; then vt_linux_dump_initrd - sleep 5 + ventoy_debug_pause 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" "boot/10pex64.wim" "BOOT/USM1PE6L.WIM" "BOOT/USM1PE6F.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 @@ -117,40 +192,143 @@ function distro_specify_initrd_file_phase2 { 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 + 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 +function ventoy_freebsd_proc { + if regexp "^12_[0-9]" $vt_volume_id; then + set vt_freebsd_ver=12.x + elif regexp "^11_[0-9]" $vt_volume_id; then + set vt_freebsd_ver=11.x + elif regexp "^10_[0-9]" $vt_volume_id; then + set vt_freebsd_ver=10.x + elif [ -e (loop)/bin/freebsd-version ]; then + vt_unix_parse_freebsd_ver (loop)/bin/freebsd-version vt_userland_ver + if regexp "\"12\.[0-9]-" $vt_userland_ver; then + set vt_freebsd_ver=12.x + elif regexp "\"11\.[0-9]-" $vt_userland_ver; then + set vt_freebsd_ver=11.x + elif regexp "\"10\.[0-9]-" $vt_userland_ver; then + set vt_freebsd_ver=10.x + fi + else + set vt_freebsd_ver=12.x + fi + + if file --is-i386-kfreebsd (loop)/boot/kernel/kernel; then + set vt_freebsd_bit=32 + else + set vt_freebsd_bit=64 + fi + + if [ -n "${vtdebug_flag}" ]; then + echo "This is FreeBSD $vt_freebsd_ver ${vt_freebsd_bit}bit" + fi + + for file in "geom_nop" "ipmi"; do + if [ -e (loop)/boot/kernel/${file}.ko ]; then + set vt_unix_ko=$file + break + fi + done + + vt_unix_replace_ko $vt_unix_ko (vtunix)/ventoy_unix/FreeBSD/geom_ventoy_ko/$vt_freebsd_ver/$vt_freebsd_bit/geom_ventoy.ko.xz + vt_unix_replace_conf FreeBSD ${1}${chosen_path} +} + +function ventoy_unix_comm_proc { + vt_unix_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 + loopback vtunix $vtoy_efi_part/ventoy/ventoy_unix.cpio + + set vt_unix_type=unknown + if vt_strstr "$vt_system_id" "FreeBSD"; then + ventoy_freebsd_proc $1 ${chosen_path} + elif [ -e (loop)/bin/freebsd-version ]; then + ventoy_freebsd_proc $1 ${chosen_path} + else + if [ -n "${vtdebug_flag}" ]; then + echo "Unknown unix type" + fi fi fi - vt_windows_chain_data ${1}${chosen_path} + vt_unix_chain_data ${1}${chosen_path} + ventoy_debug_pause +} - if [ -n "${vtdebug_flag}" ]; then - sleep 5 + +function uefi_windows_menu_func { + vt_windows_reset + + if [ "$ventoy_compatible" = "NO" ]; then + + if [ "$ventoy_fs_probe" = "iso9660" ]; then + loopback -d loop + vt_iso9660_nojoliet 1 + loopback loop $1$2 + fi + + for file in "efi/microsoft/boot/bcd"; do + vt_windows_collect_wim_patch bcd (loop)/$file + done + + 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 + vt_windows_chain_data ${1}${chosen_path} + ventoy_debug_pause + 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" - sleep 5 + ventoy_pause fi } function uefi_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 $2 $1 vt_linux_clear_initrd @@ -164,20 +342,14 @@ function uefi_linux_menu_func { fi done fi - + # 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/ fi - if [ -e (loop)/syslinux/alt0/full.cz ]; then - set LoadIsoEfiDriver=on - set FirstTryBootFile='@EFI@BOOT@grubx64.efi' - fi - distro_specify_initrd_file vt_linux_initrd_count vtcount @@ -192,20 +364,56 @@ function uefi_linux_menu_func { fi 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 - terminal_output console + 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" - sleep 5 + ventoy_pause fi } +function uefi_unix_menu_func { + ventoy_unix_comm_proc $1 ${chosen_path} + + if [ -n "$vtoy_chain_mem_addr" ]; then + 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" + ventoy_pause + fi +} function uefi_iso_menu_func { @@ -230,9 +438,11 @@ function uefi_iso_menu_func { set ventoy_fs_probe=udf else set ventoy_fs_probe=iso9660 + vt_iso9660_nojoliet 0 fi loopback loop ${1}${chosen_path} + vt_parse_iso_volume ${1}${chosen_path} vt_system_id vt_volume_id get_os_type (loop) if [ -d (loop)/EFI ]; then @@ -255,19 +465,15 @@ function uefi_iso_menu_func { vt_img_sector ${1}${chosen_path} if [ "$vtoy_os" = "Windows" ]; then - vt_check_pe (loop) - if [ "$VT_PE_SUPPORT" != "YES" ]; then - if [ "$ventoy_fs_probe" = "iso9660" ]; then - set ventoy_compatible=YES - fi - fi - + vt_check_compatible_pe (loop) uefi_windows_menu_func $1 ${chosen_path} + elif [ "$vtoy_os" = "Unix" ]; then + uefi_unix_menu_func $1 ${chosen_path} else uefi_linux_menu_func $1 ${chosen_path} fi - terminal_output gfxterm + ventoy_gui_console } function uefi_iso_memdisk { @@ -276,41 +482,61 @@ function uefi_iso_memdisk { 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 + + ventoy_gui_console } 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 + + 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 - - 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 linux16 $vtoy_path/ipxe.krn ${vtdebug_flag} ibft mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size} boot else echo "chain empty failed" - sleep 5 + ventoy_pause 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 $2 $1 vt_linux_clear_initrd @@ -350,21 +576,32 @@ function legacy_linux_menu_func { locate_initrd fi - vt_linux_chain_data ${1}${chosen_path} + vt_linux_chain_data ${1}${chosen_path} + ventoy_debug_pause - if [ -n "${vtdebug_flag}" ]; then - sleep 5 + 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" + ventoy_pause fi +} + + +function legacy_unix_menu_func { + ventoy_unix_comm_proc $1 ${chosen_path} 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" - sleep 5 + ventoy_pause fi } + function legacy_iso_menu_func { if [ -d (loop)/ ]; then @@ -379,12 +616,13 @@ function legacy_iso_menu_func { 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} + vt_parse_iso_volume ${1}${chosen_path} vt_system_id vt_volume_id get_os_type (loop) - + if [ -n "$vtcompat" ]; then set ventoy_compatible=YES unset vtcompat @@ -397,14 +635,10 @@ function legacy_iso_menu_func { vt_img_sector ${1}${chosen_path} if [ "$vtoy_os" = "Windows" ]; then - vt_check_pe (loop) - if [ "$VT_PE_SUPPORT" != "YES" ]; then - if [ "$ventoy_fs_probe" = "iso9660" ]; then - set ventoy_compatible=YES - fi - fi - + vt_check_compatible_pe (loop) legacy_windows_menu_func $1 ${chosen_path} + elif [ "$vtoy_os" = "Unix" ]; then + legacy_unix_menu_func $1 ${chosen_path} else legacy_linux_menu_func $1 ${chosen_path} fi @@ -420,55 +654,75 @@ function legacy_iso_memdisk { } function iso_common_menuentry { + unset vt_system_id + unset vt_volume_id + if [ "$grub_platform" = "pc" ]; then if vt_check_mode 0; then - legacy_iso_memdisk $iso_path + legacy_iso_memdisk $vtoy_iso_part else - legacy_iso_menu_func $iso_path + legacy_iso_menu_func $vtoy_iso_part fi else if vt_check_mode 0; then - uefi_iso_memdisk $iso_path + uefi_iso_memdisk $vtoy_iso_part else - uefi_iso_menu_func $iso_path + uefi_iso_menu_func $vtoy_iso_part fi fi } -function iso_unsupport_menuentry { +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 Will return to main menu after 10 seconds ...\n" - sleep 10 + 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 ${iso_path}${chosen_path} - if [ -n "${vtdebug_flag}" ]; then - sleep 5 - fi + 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 - 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} + ventoy_gui_console fi boot else echo "chain empty failed" - sleep 5 + ventoy_pause fi } function wim_unsupport_menuentry { - echo -e "\n The name of the wim file could NOT contain space or non-ascii characters. \n" - echo -e "\n Will return to main menu after 10 seconds ...\n" - sleep 10 + 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 } + + ############################################################# ############################################################# ############################################################# @@ -477,21 +731,21 @@ function wim_unsupport_menuentry { ############################################################# ############################################################# -set VENTOY_VERSION="1.0.12" +set VENTOY_VERSION="1.0.17" # 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 - set VTOY_MEM_DISK_STR="[Memdisk]" -set VTOY_ISO_RAW_STR="ISO RAW" +set VTOY_ISO_RAW_STR="Compatible Mode" 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" @@ -502,29 +756,49 @@ fi 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 - set iso_path=(hd$vtid,1) + set vtoy_iso_part=(hd$vtid,1) set vtoy_efi_part=(hd$vtid,2) 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 - 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 -loadfont ascii #Load Plugin -if [ -f $iso_path/ventoy/ventoy.json ]; then - vt_load_plugin $iso_path +if [ -f $vtoy_iso_part/ventoy/ventoy.json ]; then + vt_load_plugin $vtoy_iso_part +fi + +if [ -n "$VTOY_MENU_TIMEOUT" ]; then + set timeout=$VTOY_MENU_TIMEOUT +else + unset timeout fi -if [ -f $iso_path/ventoy/ventoy_wimboot.img ]; then - vt_load_wimboot $iso_path/ventoy/ventoy_wimboot.img +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 @@ -532,10 +806,10 @@ 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" + set VTOY_HOTKEY_TIP="F1:Memdisk F2:Power F3:TreeView F4:Localboot F5:Debug F6:ExMenu" else set VTOY_F3_CMD="vt_dynamic_menu 1 0" - set VTOY_HOTKEY_TIP="F1:Memdisk F2:Power F3:ListView" + set VTOY_HOTKEY_TIP="F1:Memdisk F2:Power F3:ListView F4:Localboot F5:Debug F6:ExMenu" fi @@ -545,17 +819,31 @@ else set gfxmode=1920x1080,1366x768,1024x768 fi -if [ -n "$vtoy_theme" ]; then - set theme=$vtoy_theme -else - set theme=$prefix/themes/ventoy/theme.txt +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 -terminal_output gfxterm +#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 -vt_list_img $iso_path ventoy_img_count +vt_list_img $vtoy_iso_part ventoy_img_count #Main menu if [ $ventoy_img_count -gt 0 ]; then