update for new release

This commit is contained in:
longpanda
2020-07-22 23:30:01 +08:00
parent a6d3ecc7a9
commit 0f8478fbe1
433 changed files with 2597 additions and 620 deletions

View File

@@ -67,6 +67,18 @@ 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
@@ -292,6 +304,8 @@ function uefi_linux_menu_func {
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
@@ -538,24 +552,24 @@ function legacy_iso_memdisk {
function iso_common_menuentry {
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 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 "\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 {
@@ -564,7 +578,7 @@ function iso_unsupport_menuentry {
function wim_common_menuentry {
vt_chosen_img_path chosen_path
vt_wim_chain_data ${iso_path}${chosen_path}
vt_wim_chain_data ${vtoy_iso_part}${chosen_path}
ventoy_debug_pause
@@ -591,7 +605,7 @@ function efi_common_menuentry {
vt_chosen_img_path chosen_path
ventoy_cli_console
chainloader ${iso_path}${chosen_path}
chainloader ${vtoy_iso_part}${chosen_path}
boot
ventoy_gui_console
}
@@ -610,7 +624,7 @@ function efi_unsupport_menuentry {
#############################################################
#############################################################
set VENTOY_VERSION="1.0.15"
set VENTOY_VERSION="1.0.16"
# Default menu display mode, you can change it as you want.
# 0: List mode
@@ -624,6 +638,7 @@ 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"
@@ -637,15 +652,15 @@ if [ "$vtoy_dev" = "tftp" ]; then
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 $iso_path/ventoy/ventoy.json ]; then
set vt_plugin_path=$iso_path
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
@@ -657,16 +672,16 @@ else
set vtoy_path=($root)/ventoy
fi
set iso_path=($vtoy_dev,1)
set vtoy_iso_part=($vtoy_dev,1)
set vtoy_efi_part=($vtoy_dev,2)
loadfont unicode
set vt_plugin_path=$iso_path
set vt_plugin_path=$vtoy_iso_part
fi
#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
@@ -675,8 +690,8 @@ 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
@@ -684,10 +699,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 F4:Localboot F5:Debug"
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 F4:Localboot F5:Debug"
set VTOY_HOTKEY_TIP="F1:Memdisk F2:Power F3:ListView F4:Localboot F5:Debug F6:ExMenu"
fi
@@ -708,9 +723,20 @@ else
terminal_output gfxterm
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
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