X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/147a23c9dd37b84faf4316cd4d35facede55a33f..e8d17f9bb1070fe612f7fffc1f2b020f07e06a1c:/INSTALL/grub/grub.cfg diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg index bafba8d..95df45b 100644 --- a/INSTALL/grub/grub.cfg +++ b/INSTALL/grub/grub.cfg @@ -59,7 +59,7 @@ function ventoy_diagnosis { configfile $prefix/debug.cfg } -function ventoy_localboot { +function ventoy_localboot { configfile $prefix/localboot.cfg } @@ -270,7 +270,9 @@ function distro_specify_initrd_file_phase2 { vt_linux_specify_initrd_file /live/initrd2.img vt_linux_specify_initrd_file /install.amd/initrd.gz vt_linux_specify_initrd_file /install.amd/gtk/initrd.gz - + elif [ -f (loop)/boot/grub/kernels.cfg ]; then + vt_linux_parse_initrd_grub file (loop)/boot/grub/kernels.cfg + fi } @@ -1358,7 +1360,7 @@ function img_unsupport_menuentry { ############################################################# ############################################################# -set VENTOY_VERSION="1.0.27" +set VENTOY_VERSION="1.0.28" #ACPI not compatible with Window7/8, so disable by default set VTOY_PARAM_NO_ACPI=1 @@ -1506,6 +1508,34 @@ export vtoy_efi_part export VENTOY_VERSION export VTOY_CUR_VIDEO_MODE +#special VTOY_DEFAULT_IMAGE process +if [ -n "$VTOY_DEFAULT_IMAGE" ]; then + if regexp --set 1:vtHotkey --set 2:vtDefault "(F[2-9])>(.*)" "$VTOY_DEFAULT_IMAGE"; then + + set default="$vtDefault" + if [ -z "$VTOY_MENU_TIMEOUT" ]; then + set timeout=0 + else + set timeout=$VTOY_MENU_TIMEOUT + fi + + export timeout + export default + + if [ "$vtHotkey" = "F2" ]; then + ventoy_power + elif [ "$vtHotkey" = "F4" ]; then + ventoy_localboot + elif [ "$vtHotkey" = "F5" ]; then + ventoy_diagnosis + elif [ "$vtHotkey" = "F6" ]; then + ventoy_ext_menu + fi + + unset timeout + unset default + fi +fi #colect all image files (iso files) set ventoy_img_count=0