diff --git a/INSTALL/EFI/BOOT/grubx64_real.efi b/INSTALL/EFI/BOOT/grubx64_real.efi index ea294147..19c0ab09 100644 Binary files a/INSTALL/EFI/BOOT/grubx64_real.efi and b/INSTALL/EFI/BOOT/grubx64_real.efi differ diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg index 3bf13d13..18b9b050 100644 --- a/INSTALL/grub/grub.cfg +++ b/INSTALL/grub/grub.cfg @@ -16,6 +16,33 @@ # #************************************************************************************ +function ventoy_boot_from_hdd { + if [ "$grub_platform" = "pc" ]; then + if [ "$iso_path" = "(hd0,1)" ]; then + if [ -b (hd1) ]; then + set root=(hd1) + drivemap -s hd0 hd1 + chainloader +1 + boot + else + echo "No local hdd found ..." + sleep 3 + fi + else + set root=(hd0) + chainloader +1 + boot + fi + else + exit + fi +} + +function ventoy_reboot { + reboot +} + + function get_os_type { set vtoy_os=Linux for file in "efi/microsoft" "sources/boot.wim" "boot/bcd" "bootmgr.efi" "boot/etfsboot.com"; do @@ -395,7 +422,7 @@ function legacy_iso_memdisk { ############################################################# ############################################################# -set VENTOY_VERSION="1.0.08b1" +set VENTOY_VERSION="1.0.08b2" #disable timeout unset timeout @@ -404,6 +431,9 @@ set VTOY_MEM_DISK_STR="MEMDISK" set VTOY_ISO_RAW_STR="ISO RAW" set VTOY_ISO_UEFI_DRV_STR="UEFI FS" +set VTOY_F2_CMD="ventoy_boot_from_hdd" +set VTOY_F3_CMD="ventoy_reboot" + vt_device $root vtoy_dev if [ "$vtoy_dev" = "tftp" ]; then diff --git a/INSTALL/grub/i386-pc/core.img b/INSTALL/grub/i386-pc/core.img index 0033e1ed..3e06b842 100644 Binary files a/INSTALL/grub/i386-pc/core.img and b/INSTALL/grub/i386-pc/core.img differ diff --git a/INSTALL/grub/themes/ventoy/background.png b/INSTALL/grub/themes/ventoy/background.png index 5464b1d7..10098dd3 100644 Binary files a/INSTALL/grub/themes/ventoy/background.png and b/INSTALL/grub/themes/ventoy/background.png differ diff --git a/INSTALL/grub/themes/ventoy/theme.txt b/INSTALL/grub/themes/ventoy/theme.txt index dddce556..86f5ec3d 100644 --- a/INSTALL/grub/themes/ventoy/theme.txt +++ b/INSTALL/grub/themes/ventoy/theme.txt @@ -49,6 +49,14 @@ terminal-box: "terminal_box_*.png" highlight_style = "*" } ++ hbox{ + left = 40% + top = 95% + width = 10% + height = 25 + + label {text = "F1:Memdisk" color = "blue" align = "left"} +} + + hbox{ left = 90% diff --git a/INSTALL/grub/x86_64-efi/normal.mod b/INSTALL/grub/x86_64-efi/normal.mod index 2a85a503..db224ddd 100644 Binary files a/INSTALL/grub/x86_64-efi/normal.mod and b/INSTALL/grub/x86_64-efi/normal.mod differ diff --git a/INSTALL/ventoy/ventoy.cpio b/INSTALL/ventoy/ventoy.cpio index 30c34e76..c181fcec 100644 Binary files a/INSTALL/ventoy/ventoy.cpio and b/INSTALL/ventoy/ventoy.cpio differ diff --git a/VtoyTool/vtoytool/00/vtoytool_32 b/VtoyTool/vtoytool/00/vtoytool_32 index 8ebeaa4b..d2a0c363 100644 Binary files a/VtoyTool/vtoytool/00/vtoytool_32 and b/VtoyTool/vtoytool/00/vtoytool_32 differ diff --git a/VtoyTool/vtoytool/00/vtoytool_64 b/VtoyTool/vtoytool/00/vtoytool_64 index 0bd3dca2..bb9d703f 100644 Binary files a/VtoyTool/vtoytool/00/vtoytool_64 and b/VtoyTool/vtoytool/00/vtoytool_64 differ