mirrors/Ventoy
1
0
Fork 0
mirror of https://github.com/ventoy/Ventoy.git synced 2025-06-03 08:28:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

1.0.09 release

Browse source
This commit is contained in:
longpanda 2020-05-09 22:15:06 +08:00
parent c84c072209
commit d0edcc0ef0
36 changed files with 791 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

45
INSTALL/grub/grub.cfg
View file

@ -110,6 +110,10 @@ function distro_specify_initrd_file_phase2 {
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
fi
}
@ -142,15 +146,15 @@ function uefi_windows_menu_func {
function uefi_linux_menu_func {
if [ "$ventoy_compatible" = "NO" ]; then
vt_load_cpio ${vtoy_path}/ventoy.cpio
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
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
@ -250,9 +254,9 @@ function uefi_iso_menu_func {
set ventoy_compatible=YES
fi
uefi_windows_menu_func $1
uefi_windows_menu_func $1 ${chosen_path}
else
uefi_linux_menu_func $1
uefi_linux_menu_func $1 ${chosen_path}
fi
terminal_output gfxterm
@ -300,8 +304,7 @@ function legacy_windows_menu_func {
function legacy_linux_menu_func {
if [ "$ventoy_compatible" = "NO" ]; then
vt_load_cpio $vtoy_path/ventoy.cpio
vt_load_cpio $vtoy_path/ventoy.cpio $2 $1
vt_linux_clear_initrd
@ -392,9 +395,9 @@ function legacy_iso_menu_func {
set ventoy_compatible=YES
fi
legacy_windows_menu_func $1
legacy_windows_menu_func $1 ${chosen_path}
else
legacy_linux_menu_func $1
legacy_linux_menu_func $1 ${chosen_path}
fi
}
@ -432,7 +435,13 @@ function common_menuentry {
#############################################################
#############################################################
set VENTOY_VERSION="1.0.08"
set VENTOY_VERSION="1.0.09"
# 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
@ -442,9 +451,15 @@ set VTOY_ISO_RAW_STR="ISO RAW"
set VTOY_ISO_UEFI_DRV_STR="UEFI FS"
set VTOY_F2_CMD="ventoy_power"
set VTOY_F3_CMD="vt_dynamic_menu tree"
set VTOY_HOTKEY_TIP="F1:Memdisk F2:Power F3:TreeView"
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"
else
set VTOY_F3_CMD="vt_dynamic_menu 1 0"
set VTOY_HOTKEY_TIP="F1:Memdisk F2:Power F3:ListView"
fi
if [ "$grub_platform" = "pc" ]; then
set VTOY_TEXT_MENU_VER="Ventoy $VENTOY_VERSION BIOS www.ventoy.net"
else
@ -492,7 +507,11 @@ vt_list_img $iso_path ventoy_img_count
#Main menu
if [ $ventoy_img_count -gt 0 ]; then
vt_dynamic_menu
if [ $VTOY_DEFAULT_MENU_MODE -eq 0 ]; then
vt_dynamic_menu 0 0
else
vt_dynamic_menu 0 1
fi
else
menuentry "No ISO files found (Press enter to reboot ...)" {
echo -e "\n Rebooting ... "

BIN
INSTALL/grub/i386-pc/core.img
View file

Binary file not shown.