Mirrors/Ventoy
1
0
Fork 0
mirror of https://github.com/ventoy/Ventoy.git synced 2025-08-28 00:11:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Auto use memdisk/grub2/wimboot mode if the ISO file name has _VTMEMDISK/_VTGRUB2/_VTWIMBOOT suffix. (e.g. ubuntu-22.04-desktop-amd64_VTGRUB2.iso)

Browse Source
This commit is contained in:
longpanda
2022-06-08 10:15:56 +08:00
parent bf2517bb25
commit 1c0b4ee903
2 changed files with 89 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
INSTALL/grub/grub.cfg
View File

@@ -621,7 +621,7 @@ function uefi_windows_menu_func {
vt_windows_chain_data "${1}${chosen_path}"
ventoy_debug_pause
if vt_check_mode 4; then
if vt_check_mode 4 "$vt_chosen_name"; then
vtoy_windows_wimboot_func
fi
@@ -779,7 +779,7 @@ function uefi_linux_menu_func {
ventoy_cli_console
unset vtGrub2Mode
if vt_check_mode 3; then
if vt_check_mode 3 "$vt_chosen_name"; then
set vtGrub2Mode=1
elif vt_str_begin "$vt_volume_id" "KRD"; then
if [ -f (loop)/boot/grub/grub.cfg.sig ]; then
@@ -867,7 +867,7 @@ function uefi_iso_menu_func {
if [ -n "$vtisouefi" ]; then
set LoadIsoEfiDriver=on
unset vtisouefi
elif vt_check_mode 2; then
elif vt_check_mode 2 "$vt_chosen_name"; then
set LoadIsoEfiDriver=on
else
unset LoadIsoEfiDriver
@@ -904,7 +904,7 @@ function uefi_iso_menu_func {
if [ -n "$vtcompat" ]; then
set ventoy_compatible=YES
unset vtcompat
elif vt_check_mode 1; then
elif vt_check_mode 1 "$vt_chosen_name"; then
set ventoy_compatible=YES
else
vt_check_compatible (loop)
@@ -1050,7 +1050,7 @@ function legacy_windows_menu_func {
vt_windows_chain_data "${1}${chosen_path}"
ventoy_debug_pause
if vt_check_mode 4; then
if vt_check_mode 4 "$vt_chosen_name"; then
vtoy_windows_wimboot_func
fi
@@ -1133,7 +1133,7 @@ function legacy_linux_menu_func {
ventoy_debug_pause
if [ -n "$vtoy_chain_mem_addr" ]; then
if vt_check_mode 3; then
if vt_check_mode 3 "$vt_chosen_name"; then
ventoy_acpi_param ${vtoy_chain_mem_addr} 2048
ventoy_cli_console
@@ -1212,7 +1212,7 @@ function legacy_iso_menu_func {
if [ -n "$vtcompat" ]; then
set ventoy_compatible=YES
unset vtcompat
elif vt_check_mode 1; then
elif vt_check_mode 1 "$vt_chosen_name"; then
set ventoy_compatible=YES
else
vt_check_compatible (loop)
@@ -1343,7 +1343,7 @@ function iso_common_menuentry {
# auto memdisk mode for some special ISO files
vt_iso_vd_id_parse "${vtoy_iso_part}${vt_chosen_path}"
unset vtMemDiskBoot
if vt_check_mode 0; then
if vt_check_mode 0 "$vt_chosen_name"; then
set vtMemDiskBoot=1
else
if [ "$grub_platform" = "pc" ]; then
@@ -1380,7 +1380,7 @@ function iso_common_menuentry {
}
function miso_common_menuentry {
vt_chosen_img_path vt_chosen_path vt_chosen_size
vt_chosen_img_path vt_chosen_path vt_chosen_size vt_chosen_name
if vt_check_password "${vt_chosen_path}"; then
return
@@ -1414,7 +1414,7 @@ function iso_unsupport_menuentry {
}
function wim_common_menuentry {
vt_chosen_img_path vt_chosen_path vt_chosen_size
vt_chosen_img_path vt_chosen_path vt_chosen_size vt_chosen_name
if vt_check_password "${vt_chosen_path}"; then
return
@@ -1453,7 +1453,7 @@ function wim_unsupport_menuentry {
}
function efi_common_menuentry {
vt_chosen_img_path vt_chosen_path vt_chosen_size
vt_chosen_img_path vt_chosen_path vt_chosen_size vt_chosen_name
if vt_check_password "${vt_chosen_path}"; then
return
@@ -1523,7 +1523,7 @@ function vhdboot_common_func {
}
function vhd_common_menuentry {
vt_chosen_img_path vt_chosen_path vt_chosen_size
vt_chosen_img_path vt_chosen_path vt_chosen_size vt_chosen_name
if vt_check_password "${vt_chosen_path}"; then
return
@@ -1620,7 +1620,7 @@ function vtoyboot_common_func {
}
function vtoy_common_menuentry {
vt_chosen_img_path vt_chosen_path vt_chosen_size
vt_chosen_img_path vt_chosen_path vt_chosen_size vt_chosen_name
if vt_check_password "${vt_chosen_path}"; then
return
@@ -2030,7 +2030,7 @@ function img_common_menuentry {
set ventoy_busybox_ver=32
unset LoadIsoEfiDriver
vt_chosen_img_path vt_chosen_path vt_chosen_size
vt_chosen_img_path vt_chosen_path vt_chosen_size vt_chosen_name
if vt_check_password "${vt_chosen_path}"; then
return
@@ -2041,7 +2041,7 @@ function img_common_menuentry {
fi
if [ "$grub_platform" = "pc" ]; then
if vt_check_mode 0; then
if vt_check_mode 0 "$vt_chosen_name"; then
legacy_img_memdisk $vtoy_iso_part "$vt_chosen_path"
return
fi