From 7715bd705cf56c45a7c1f434235eb7279f4d089b Mon Sep 17 00:00:00 2001 From: longpanda Date: Tue, 27 Apr 2021 18:22:10 +0800 Subject: [PATCH] 1.0.42 release --- IMG/cpio/ventoy/ventoy_chain.sh | 3 +-- IMG/cpio/ventoy/ventoy_loop.sh | 2 +- INSTALL/grub/debug.cfg | 44 ++++++++++++++++----------------- INSTALL/grub/grub.cfg | 2 +- INSTALL/grub/keyboard.cfg | 42 +++++++++++++++---------------- INSTALL/grub/localboot.cfg | 18 +++++++------- 6 files changed, 55 insertions(+), 56 deletions(-) diff --git a/IMG/cpio/ventoy/ventoy_chain.sh b/IMG/cpio/ventoy/ventoy_chain.sh index af1747a6..10fcc426 100644 --- a/IMG/cpio/ventoy/ventoy_chain.sh +++ b/IMG/cpio/ventoy/ventoy_chain.sh @@ -153,10 +153,9 @@ ventoy_get_os_type() { echo 'rhel7'; return elif $GREP -q 'openEuler' /etc/os-release; then echo 'openEuler'; return - elif $GREP -q 'fuyu' /etc/os-release; then + elif $GREP -q 'fuyu' /etc/os-release; then echo 'openEuler'; return fi - fi if $BUSYBOX_PATH/dmesg | $GREP -q -m1 "Xen:"; then diff --git a/IMG/cpio/ventoy/ventoy_loop.sh b/IMG/cpio/ventoy/ventoy_loop.sh index ae76a572..bf67ec47 100644 --- a/IMG/cpio/ventoy/ventoy_loop.sh +++ b/IMG/cpio/ventoy/ventoy_loop.sh @@ -198,7 +198,7 @@ ventoy_get_os_type() { echo 'rhel7'; return elif $GREP -q 'openEuler' /etc/os-release; then echo 'openEuler'; return - elif $GREP -q 'fuyu' /etc/os-release; then + elif $GREP -q 'fuyu' /etc/os-release; then echo 'openEuler'; return fi fi diff --git a/INSTALL/grub/debug.cfg b/INSTALL/grub/debug.cfg index dcd0a060..87d887e8 100644 --- a/INSTALL/grub/debug.cfg +++ b/INSTALL/grub/debug.cfg @@ -1,7 +1,7 @@ source $prefix/keyboard.cfg -submenu "Resolution Configuration" --class=debug_resolution { +submenu "Resolution Configuration" --class=debug_resolution --class=F5tool { menuentry 'Return to previous menu [Esc]' --class=vtoyret VTOY_RET { echo 'Return ...' } @@ -16,7 +16,7 @@ submenu "Resolution Configuration" --class=debug_resolution { set vtActive="[*]" fi - menuentry "$vtCurMode $vtActive" --class=debug_videomode VTOY_RUN_RET { + menuentry "$vtCurMode $vtActive" --class=debug_videomode --class=debug_resolution --class=F5tool VTOY_RUN_RET { terminal_output console set gfxmode=$1 terminal_output gfxterm @@ -26,11 +26,11 @@ submenu "Resolution Configuration" --class=debug_resolution { done } -submenu "Screen Display Mode" --class=debug_screen_mode { - menuentry 'Force Text Mode' --class=debug_text_mode { +submenu "Screen Display Mode" --class=debug_screen_mode --class=F5tool { + menuentry 'Force Text Mode' --class=debug_text_mode --class=debug_screen_mode --class=F5tool { terminal_output console } - menuentry 'Force Graphics Mode' --class=debug_gui_mode { + menuentry 'Force Graphics Mode' --class=debug_gui_mode --class=debug_screen_mode --class=F5tool { terminal_output gfxterm } menuentry 'Return to previous menu [Esc]' --class=vtoyret VTOY_RET { @@ -39,8 +39,8 @@ submenu "Screen Display Mode" --class=debug_screen_mode { } if [ "$grub_platform" != "pc" ]; then - submenu 'Ventoy UEFI Utilities' --class=debug_util { - menuentry 'Fixup Windows BlinitializeLibrary Failure' --class=debug_util_blinit { + submenu 'Ventoy UEFI Utilities' --class=debug_util --class=F5tool { + menuentry 'Fixup Windows BlinitializeLibrary Failure' --class=debug_util_blinit --class=debug_util --class=F5tool { chainloader ${vtoy_path}/vtoyutil_${VTOY_EFI_ARCH}.efi env_param=${env_param} ${vtdebug_flag} feature=fix_windows_mmap boot echo -e "\npress ENTER to exit ..." @@ -54,8 +54,8 @@ if [ "$grub_platform" != "pc" ]; then fi -submenu 'Check plugin json configuration (ventoy.json)' --class=debug_json { - menuentry 'Check global control plugin configuration' --class=debug_control { +submenu 'Check plugin json configuration (ventoy.json)' --class=debug_json --class=F5tool { + menuentry 'Check global control plugin configuration' --class=debug_control --class=debug_json --class=F5tool { set pager=1 vt_check_plugin_json $vt_plugin_path control $vtoy_iso_part @@ -64,7 +64,7 @@ submenu 'Check plugin json configuration (ventoy.json)' --class=debug_json { unset pager } - menuentry 'Check theme plugin configuration' --class=debug_theme { + menuentry 'Check theme plugin configuration' --class=debug_theme --class=debug_json --class=F5tool { set pager=1 vt_check_plugin_json $vt_plugin_path theme $vtoy_iso_part @@ -73,7 +73,7 @@ submenu 'Check plugin json configuration (ventoy.json)' --class=debug_json { unset pager } - menuentry 'Check auto install plugin configuration' --class=debug_autoinstall { + menuentry 'Check auto install plugin configuration' --class=debug_autoinstall --class=debug_json --class=F5tool { set pager=1 vt_check_plugin_json $vt_plugin_path auto_install $vtoy_iso_part @@ -82,7 +82,7 @@ submenu 'Check plugin json configuration (ventoy.json)' --class=debug_json { unset pager } - menuentry 'Check persistence plugin configuration' --class=debug_persistence { + menuentry 'Check persistence plugin configuration' --class=debug_persistence --class=debug_json --class=F5tool { set pager=1 vt_check_plugin_json $vt_plugin_path persistence $vtoy_iso_part @@ -94,7 +94,7 @@ submenu 'Check plugin json configuration (ventoy.json)' --class=debug_json { unset pager } - menuentry 'Check menu alias plugin configuration' --class=debug_menualias { + menuentry 'Check menu alias plugin configuration' --class=debug_menualias --class=debug_json --class=F5tool { set pager=1 vt_check_plugin_json $vt_plugin_path menu_alias $vtoy_iso_part @@ -103,7 +103,7 @@ submenu 'Check plugin json configuration (ventoy.json)' --class=debug_json { unset pager } - menuentry 'Check menu class plugin configuration' --class=debug_menuclass { + menuentry 'Check menu class plugin configuration' --class=debug_menuclass --class=debug_json --class=F5tool { set pager=1 vt_check_plugin_json $vt_plugin_path menu_class $vtoy_iso_part @@ -112,7 +112,7 @@ submenu 'Check plugin json configuration (ventoy.json)' --class=debug_json { unset pager } - menuentry 'Check injection plugin configuration' --class=debug_injection { + menuentry 'Check injection plugin configuration' --class=debug_injection --class=debug_json --class=F5tool { set pager=1 vt_check_plugin_json $vt_plugin_path injection $vtoy_iso_part @@ -121,7 +121,7 @@ submenu 'Check plugin json configuration (ventoy.json)' --class=debug_json { unset pager } - menuentry 'Check auto memdisk plugin configuration' --class=debug_automemdisk { + menuentry 'Check auto memdisk plugin configuration' --class=debug_automemdisk --class=debug_json --class=F5tool { set pager=1 vt_check_plugin_json $vt_plugin_path auto_memdisk $vtoy_iso_part @@ -130,7 +130,7 @@ submenu 'Check plugin json configuration (ventoy.json)' --class=debug_json { unset pager } - menuentry 'Check image list plugin configuration' --class=debug_imagelist { + menuentry 'Check image list plugin configuration' --class=debug_imagelist --class=debug_json --class=F5tool { set pager=1 vt_check_plugin_json $vt_plugin_path image_list $vtoy_iso_part @@ -139,7 +139,7 @@ submenu 'Check plugin json configuration (ventoy.json)' --class=debug_json { unset pager } - menuentry 'Check image blacklist plugin configuration' --class=debug_imageblacklist { + menuentry 'Check image blacklist plugin configuration' --class=debug_imageblacklist --class=debug_json --class=F5tool { set pager=1 vt_check_plugin_json $vt_plugin_path image_blacklist $vtoy_iso_part @@ -148,7 +148,7 @@ submenu 'Check plugin json configuration (ventoy.json)' --class=debug_json { unset pager } - menuentry 'Check boot conf replace plugin configuration' --class=debug_bootconf_replace { + menuentry 'Check boot conf replace plugin configuration' --class=debug_bootconf_replace --class=debug_json --class=F5tool { set pager=1 vt_check_plugin_json $vt_plugin_path conf_replace $vtoy_iso_part @@ -157,7 +157,7 @@ submenu 'Check plugin json configuration (ventoy.json)' --class=debug_json { unset pager } - menuentry 'Check dud plugin configuration' --class=debug_dud { + menuentry 'Check dud plugin configuration' --class=debug_dud --class=debug_json --class=F5tool { set pager=1 vt_check_plugin_json $vt_plugin_path dud $vtoy_iso_part @@ -166,7 +166,7 @@ submenu 'Check plugin json configuration (ventoy.json)' --class=debug_json { unset pager } - menuentry 'Check password plugin configuration' --class=debug_pwd { + menuentry 'Check password plugin configuration' --class=debug_pwd --class=debug_json --class=F5tool { set pager=1 vt_check_plugin_json $vt_plugin_path password $vtoy_iso_part @@ -175,7 +175,7 @@ submenu 'Check plugin json configuration (ventoy.json)' --class=debug_json { unset pager } - menuentry 'Check custom boot plugin configuration' --class=debug_custom_boot { + menuentry 'Check custom boot plugin configuration' --class=debug_custom_boot --class=debug_json --class=F5tool { set pager=1 vt_check_plugin_json $vt_plugin_path custom_boot $vtoy_iso_part diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg index d05e42a5..8990ad5f 100644 --- a/INSTALL/grub/grub.cfg +++ b/INSTALL/grub/grub.cfg @@ -1702,7 +1702,7 @@ function img_unsupport_menuentry { ############################################################# ############################################################# -set VENTOY_VERSION="1.0.41" +set VENTOY_VERSION="1.0.42" #ACPI not compatible with Window7/8, so disable by default set VTOY_PARAM_NO_ACPI=1 diff --git a/INSTALL/grub/keyboard.cfg b/INSTALL/grub/keyboard.cfg index af3f4f29..8145dcbf 100644 --- a/INSTALL/grub/keyboard.cfg +++ b/INSTALL/grub/keyboard.cfg @@ -1,62 +1,62 @@ -submenu "Keyboard Layouts" --class=debug_krdlayout { - menuentry QWERTY_USA --class=debug_kbd { +submenu "Keyboard Layouts" --class=debug_krdlayout --class=F5tool { + menuentry QWERTY_USA --class=debug_kbd --class=debug_krdlayout --class=F5tool { set_keyboard_layout QWERTY_USA } - menuentry AZERTY --class=debug_kbd { + menuentry AZERTY --class=debug_kbd --class=debug_krdlayout --class=F5tool { set_keyboard_layout AZERTY } - menuentry CZECH_QWERTY --class=debug_kbd { + menuentry CZECH_QWERTY --class=debug_kbd --class=debug_krdlayout --class=F5tool { set_keyboard_layout CZECH_QWERTY } - menuentry CZECH_QWERTZ --class=debug_kbd { + menuentry CZECH_QWERTZ --class=debug_kbd --class=debug_krdlayout --class=F5tool { set_keyboard_layout CZECH_QWERTZ } - menuentry DANISH --class=debug_kbd { + menuentry DANISH --class=debug_kbd --class=debug_krdlayout --class=F5tool { set_keyboard_layout DANISH } - menuentry DVORAK_USA --class=debug_kbd { + menuentry DVORAK_USA --class=debug_kbd --class=debug_krdlayout --class=F5tool { set_keyboard_layout DVORAK_USA } - menuentry FRENCH --class=debug_kbd { + menuentry FRENCH --class=debug_kbd --class=debug_krdlayout --class=F5tool { set_keyboard_layout FRENCH } - menuentry GERMAN --class=debug_kbd { + menuentry GERMAN --class=debug_kbd --class=debug_krdlayout --class=F5tool { set_keyboard_layout GERMAN } - menuentry ITALIANO --class=debug_kbd { + menuentry ITALIANO --class=debug_kbd --class=debug_krdlayout --class=F5tool { set_keyboard_layout ITALIANO } - menuentry JAPAN_106 --class=debug_kbd { + menuentry JAPAN_106 --class=debug_kbd --class=debug_krdlayout --class=F5tool { set_keyboard_layout JAPAN_106 } - menuentry LATIN_USA --class=debug_kbd { + menuentry LATIN_USA --class=debug_kbd --class=debug_krdlayout --class=F5tool { set_keyboard_layout LATIN_USA } - menuentry PORTU_BRAZIL --class=debug_kbd { + menuentry PORTU_BRAZIL --class=debug_kbd --class=debug_krdlayout --class=F5tool { set_keyboard_layout PORTU_BRAZIL } - menuentry QWERTY_UK --class=debug_kbd { + menuentry QWERTY_UK --class=debug_kbd --class=debug_krdlayout --class=F5tool { set_keyboard_layout QWERTY_UK } - menuentry QWERTZ --class=debug_kbd { + menuentry QWERTZ --class=debug_kbd --class=debug_krdlayout --class=F5tool { set_keyboard_layout QWERTZ } - menuentry QWERTZ_HUN --class=debug_kbd { + menuentry QWERTZ_HUN --class=debug_kbd --class=debug_krdlayout --class=F5tool { set_keyboard_layout QWERTZ_HUN } - menuentry QWERTZ_SLOV_CROAT --class=debug_kbd { + menuentry QWERTZ_SLOV_CROAT --class=debug_kbd --class=debug_krdlayout --class=F5tool { set_keyboard_layout QWERTZ_SLOV_CROAT } - menuentry SPANISH --class=debug_kbd { + menuentry SPANISH --class=debug_kbd --class=debug_krdlayout --class=F5tool { set_keyboard_layout SPANISH } - menuentry SWEDISH --class=debug_kbd { + menuentry SWEDISH --class=debug_kbd --class=debug_krdlayout --class=F5tool { set_keyboard_layout SWEDISH } - menuentry TURKISH_Q --class=debug_kbd { + menuentry TURKISH_Q --class=debug_kbd --class=debug_krdlayout --class=F5tool { set_keyboard_layout TURKISH_Q } - menuentry VIETNAMESE --class=debug_kbd { + menuentry VIETNAMESE --class=debug_kbd --class=debug_krdlayout --class=F5tool { set_keyboard_layout VIETNAMESE } } diff --git a/INSTALL/grub/localboot.cfg b/INSTALL/grub/localboot.cfg index 169a8d4d..7abd3fec 100644 --- a/INSTALL/grub/localboot.cfg +++ b/INSTALL/grub/localboot.cfg @@ -1,6 +1,6 @@ if [ "$grub_platform" = "pc" ]; then - menuentry 'Search and boot Windows' --class=boot_windows { + menuentry 'Search and boot Windows' --class=boot_windows --class=F4boot { set partid=3 while [ $partid -le 128 ]; do @@ -38,7 +38,7 @@ if [ "$grub_platform" = "pc" ]; then fi } - menuentry 'Search and boot Grub4dos' --class=boot_g4d { + menuentry 'Search and boot Grub4dos' --class=boot_g4d --class=F4boot { if search -n -s -f /grldr; then ntldr /grldr else @@ -46,19 +46,19 @@ if [ "$grub_platform" = "pc" ]; then fi } - menuentry 'Boot the 1st local disk' --class=boot_disk { + menuentry 'Boot the 1st local disk' --class=boot_disk --class=F4boot { set root=(hd0,1) chainloader +1 boot } - menuentry 'Boot the 2nd local disk' --class=boot_disk { + menuentry 'Boot the 2nd local disk' --class=boot_disk --class=F4boot { set root=(hd1,1) chainloader +1 boot } - menuentry 'Boot the 3rd local disk' --class=boot_disk { + menuentry 'Boot the 3rd local disk' --class=boot_disk --class=F4boot { set root=(hd2,1) chainloader +1 boot @@ -66,7 +66,7 @@ if [ "$grub_platform" = "pc" ]; then else - menuentry 'Search and boot Windows' --class=boot_windows { + menuentry 'Search and boot Windows' --class=boot_windows --class=F4boot { set partid=3 while [ $partid -le 128 ]; do @@ -93,7 +93,7 @@ else } if [ "$grub_cpu" = "i386" ]; then - menuentry 'Search and boot BOOTIA32.EFI' --class=boot_uefi { + menuentry 'Search and boot BOOTIA32.EFI' --class=boot_uefi --class=F4boot { set VTOY_SEARCH_NO_VTOYEFI=1 if search -n -s -f /efi/boot/bootia32.efi; then unset VTOY_SEARCH_NO_VTOYEFI @@ -106,7 +106,7 @@ else fi } elif [ "$grub_cpu" = "arm64" ]; then - menuentry 'Search and boot BOOTAA64.EFI' --class=boot_uefi { + menuentry 'Search and boot BOOTAA64.EFI' --class=boot_uefi --class=F4boot { set VTOY_SEARCH_NO_VTOYEFI=1 if search -n -s -f /efi/boot/bootaa64.efi; then unset VTOY_SEARCH_NO_VTOYEFI @@ -119,7 +119,7 @@ else fi } else - menuentry 'Search and boot BOOTX64.EFI' --class=boot_uefi { + menuentry 'Search and boot BOOTX64.EFI' --class=boot_uefi --class=F4boot { set VTOY_SEARCH_NO_VTOYEFI=1 if search -n -s -f /efi/boot/bootx64.efi; then unset VTOY_SEARCH_NO_VTOYEFI