X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/a287bf89079f32172dc357727405db19084247f7..ebaa4d954aa0b3d70f14b2fd6fec63df1599b8ce:/INSTALL/grub/grub.cfg diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg index df7d9a6..0540d46 100644 --- a/INSTALL/grub/grub.cfg +++ b/INSTALL/grub/grub.cfg @@ -44,15 +44,22 @@ function ventoy_gui_console { fi } +function ventoy_acpi_param { + if [ "$VTOY_PARAM_NO_ACPI" != "1" ]; then + vt_acpi_param "$1" "$2" + fi +} + function ventoy_power { configfile $prefix/power.cfg } -function ventoy_diagnosis { +function ventoy_diagnosis { + vt_enum_video_mode configfile $prefix/debug.cfg } -function ventoy_localboot { +function ventoy_localboot { configfile $prefix/localboot.cfg } @@ -193,7 +200,7 @@ function distro_specify_initrd_file { if [ "$vt_chosen_size" = "1133375488" ]; then if [ -d (loop)/boot/grub/x86_64-efi ]; then - vt_cpio_busybox64 + vt_cpio_busybox64 "64h" fi fi } @@ -223,6 +230,11 @@ function distro_specify_initrd_file_phase2 { if [ -f (loop)/parabola/boot/i686/parabolaiso.img ]; then vt_linux_specify_initrd_file /parabola/boot/i686/parabolaiso.img fi + elif [ -f (loop)/parabola/boot/x86_64/initramfs-linux-libre.img ]; then + vt_linux_specify_initrd_file /parabola/boot/x86_64/initramfs-linux-libre.img + if [ -f (loop)/parabola/boot/i686/initramfs-linux-libre.img ]; then + vt_linux_specify_initrd_file /parabola/boot/i686/initramfs-linux-libre.img + fi elif [ -f (loop)/hyperbola/boot/x86_64/hyperiso.img ]; then vt_linux_specify_initrd_file /hyperbola/boot/x86_64/hyperiso.img if [ -f (loop)/hyperbola/boot/i686/hyperiso.img ]; then @@ -244,20 +256,34 @@ function distro_specify_initrd_file_phase2 { vt_linux_specify_initrd_file /isolinux/initrd.gz elif [ -f (loop)/syslinux/kernel/initramfs.gz ]; then vt_linux_specify_initrd_file /syslinux/kernel/initramfs.gz - elif vt_strstr $vt_volume_id "Daphile"; then + elif vt_strstr "$vt_volume_id" "Daphile"; then vt_linux_parse_initrd_isolinux (loop)/isolinux/ elif [ -f (loop)/boot/rootfs.xz ]; then vt_linux_specify_initrd_file /boot/rootfs.xz if [ "$grub_platform" != "pc" ]; then vt_add_replace_file 0 "minimal\\x86_64\\rootfs.xz" fi + elif [ -f (loop)/arch/boot/x86_64/archiso.img ]; then + vt_linux_specify_initrd_file /arch/boot/x86_64/archiso.img + if [ "$grub_platform" != "pc" ]; then + vt_add_replace_file 0 "EFI\\archiso\\archiso.img" + fi + elif [ -f (loop)/blackarch/boot/x86_64/archiso.img ]; then + vt_linux_specify_initrd_file /blackarch/boot/x86_64/archiso.img + elif [ -f (loop)/install.amd/initrd.gz ]; then + 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 } function ventoy_get_ghostbsd_ver { - # vt_parse_iso_create_date $1/${chosen_path} vt_create_date + # vt_parse_iso_create_date "$1/${chosen_path}" vt_create_date # if regexp "^202005" "$vt_create_date"; then # set vt_freebsd_ver=12.x # fi @@ -288,6 +314,21 @@ function ventoy_get_freenas_ver { fi } +function ventoy_get_truenas_ver { + set vt_freebsd_ver=12.x + + if [ -e (loop)/TrueNAS-MANIFEST ]; then + vt_parse_freenas_ver (loop)/TrueNAS-MANIFEST vt_truenas_ver + if regexp "^13\.[0-9]" "$vt_truenas_ver"; then + set vt_freebsd_ver=13.x + elif regexp "^12\.[0-9]" "$vt_truenas_ver"; then + set vt_freebsd_ver=12.x + elif regexp "^11\.[0-9]" "$vt_truenas_ver"; then + set vt_freebsd_ver=11.x + fi + fi +} + function ventoy_get_midnightbsd_ver { set vt_freebsd_ver=11.x } @@ -296,11 +337,13 @@ function ventoy_freebsd_proc { set vtFreeBsdDistro=FreeBSD if vt_strstr "$vt_volume_id" "GHOSTBSD"; then - ventoy_get_ghostbsd_ver $1 ${chosen_path} + ventoy_get_ghostbsd_ver "$1" "${chosen_path}" elif vt_strstr "$vt_volume_id" "FREENAS"; then - ventoy_get_freenas_ver $1 ${chosen_path} + ventoy_get_freenas_ver "$1" "${chosen_path}" + elif vt_strstr "$vt_volume_id" "TRUENAS"; then + ventoy_get_truenas_ver "$1" "${chosen_path}" elif vt_strstr "$vt_volume_id" "FURYBSD"; then - ventoy_get_furybsd_ver $1 ${chosen_path} + ventoy_get_furybsd_ver "$1" "${chosen_path}" elif regexp "^13_[0-9]" "$vt_volume_id"; then set vt_freebsd_ver=13.x elif regexp "^12_[0-9]" "$vt_volume_id"; then @@ -312,7 +355,7 @@ function ventoy_freebsd_proc { elif regexp "^9_[0-9]" "$vt_volume_id"; then set vt_freebsd_ver=9.x elif [ -d (loop)/usr/midnightbsd-dist ]; then - ventoy_get_midnightbsd_ver $1 ${chosen_path} + ventoy_get_midnightbsd_ver "$1" "${chosen_path}" set vtFreeBsdDistro=MidnightBSD elif [ -e (loop)/bin/freebsd-version ]; then vt_unix_parse_freebsd_ver (loop)/bin/freebsd-version vt_userland_ver @@ -361,7 +404,7 @@ function ventoy_freebsd_proc { fi unset vt_unix_mod_path - for file in "/COPYRIGHT" "/FreeNAS-MANIFEST" "/version" "/etc/fstab"; do + for file in "/COPYRIGHT" "/FreeNAS-MANIFEST" "/TrueNAS-MANIFEST" "/version" "/etc/fstab"; do if [ -e (loop)${file} ]; then set vt_unix_mod_path=${file} break @@ -373,7 +416,7 @@ function ventoy_freebsd_proc { fi vt_unix_replace_ko $vt_unix_mod_path (vtunix)/ventoy_unix/$vtFreeBsdDistro/geom_ventoy_ko/$vt_freebsd_ver/$vt_freebsd_bit/geom_ventoy.ko.xz - vt_unix_replace_conf FreeBSD ${1}${chosen_path} + vt_unix_replace_conf FreeBSD "${1}${chosen_path}" } function ventoy_unix_comm_proc { @@ -383,7 +426,7 @@ function ventoy_unix_comm_proc { loopback vtunix $vtoy_efi_part/ventoy/ventoy_unix.cpio if [ "$vt_unix_type" = "FreeBSD" ]; then - ventoy_freebsd_proc $1 ${chosen_path} + ventoy_freebsd_proc "$1" "${chosen_path}" elif [ "$vt_unix_type" = "NetBSD" ]; then echo "NetBSD not supported" @@ -396,7 +439,7 @@ function ventoy_unix_comm_proc { fi fi - vt_unix_chain_data ${1}${chosen_path} + vt_unix_chain_data "${1}${chosen_path}" ventoy_debug_pause } @@ -409,7 +452,7 @@ function uefi_windows_menu_func { if [ "$ventoy_fs_probe" = "iso9660" ]; then loopback -d loop vt_iso9660_nojoliet 1 - loopback loop $1$2 + loopback loop "$1$2" fi for file in "efi/microsoft/boot/bcd"; do @@ -425,12 +468,13 @@ function uefi_windows_menu_func { locate_wim fi - vt_windows_chain_data ${1}${chosen_path} + vt_windows_chain_data "${1}${chosen_path}" ventoy_debug_pause if [ -n "$vtoy_chain_mem_addr" ]; then + ventoy_acpi_param ${vtoy_chain_mem_addr} 2048 ventoy_cli_console - chainloader ${vtoy_path}/ventoy_x64.efi env_param=${env_param} isoefi=${LoadIsoEfiDriver} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size} + chainloader ${vtoy_path}/ventoy_${VTOY_EFI_ARCH}.efi env_param=${env_param} isoefi=${LoadIsoEfiDriver} iso_${ventoy_fs_probe} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size} boot else echo "chain empty failed" @@ -439,15 +483,16 @@ function uefi_windows_menu_func { } function uefi_linux_menu_func { + if [ "$ventoy_compatible" = "NO" ]; then if [ "$ventoy_fs_probe" = "udf" ]; then loopback -d loop set ventoy_fs_probe=iso9660 - loopback loop $1$2 + loopback loop "$1$2" fi - vt_load_cpio ${vtoy_path}/ventoy.cpio $2 $1 "busybox=$ventoy_busybox_ver" + vt_load_cpio ${vtoy_path}/ventoy.cpio "$2" "$1" "busybox=$ventoy_busybox_ver" vt_linux_clear_initrd @@ -471,6 +516,7 @@ function uefi_linux_menu_func { distro_specify_initrd_file vt_linux_initrd_count vtcount + if [ $vtcount -eq 0 ]; then distro_specify_initrd_file_phase2 @@ -489,9 +535,21 @@ function uefi_linux_menu_func { if [ -d (loop)/arch ]; then if [ -f (loop)/arch/boot/x86_64/archiso.img ]; then vt_add_replace_file $vtindex "EFI\\archiso\\archiso.img" + elif [ -f (loop)/arch/boot/x86_64/initramfs-linux.img ]; then + vt_add_replace_file $vtindex "arch\\boot\\x86_64\\initramfs-linux.img" elif [ -f (loop)/boot/initramfs_x86_64.img ]; then vt_add_replace_file $vtindex "boot\\initramfs_x86_64.img" fi + elif [ -d (loop)/blackarch ]; then + if [ -f (loop)/blackarch/boot/x86_64/archiso.img ]; then + vt_add_replace_file $vtindex "EFI\\archiso\\archiso.img" + fi + elif [ -d (loop)/parabola ]; then + if [ -f (loop)/parabola/boot/x86_64/parabolaiso.img ]; then + vt_add_replace_file $vtindex "EFI\\parabolaiso\\parabolaiso.img" + elif [ -f (loop)/parabola/boot/x86_64/initramfs-linux-libre.img ]; then + vt_add_replace_file $vtindex "parabola\\boot\\x86_64\\initramfs-linux-libre.img" + fi elif [ -f (loop)/EFI/BOOT/initrd.gz ]; then vt_add_replace_file $vtindex "EFI\\BOOT\\initrd.gz" elif [ -f (loop)/loader/entries/thinstation.conf ]; then @@ -507,7 +565,9 @@ function uefi_linux_menu_func { fi elif [ -d (loop)/EFI/BOOT/entries ]; then if [ -f (loop)/parabola/boot/x86_64/parabolaiso.img ]; then - vt_add_replace_file 0 "EFI\\parabolaiso\\parabolaiso.img" + vt_add_replace_file 0 "EFI\\parabolaiso\\parabolaiso.img" + elif [ -f (loop)/parabola/boot/x86_64/initramfs-linux-libre.img ]; then + vt_add_replace_file $vtindex "parabola\\boot\\x86_64\\initramfs-linux-libre.img" fi elif [ -e (loop)/syslinux/alt0/full.cz ]; then vt_add_replace_file 0 "EFI\\BOOT\\full.cz" @@ -518,11 +578,12 @@ function uefi_linux_menu_func { fi - vt_linux_chain_data ${1}${chosen_path} + vt_linux_chain_data "${1}${chosen_path}" if [ -n "$vtoy_chain_mem_addr" ]; then + ventoy_acpi_param ${vtoy_chain_mem_addr} 2048 ventoy_cli_console - chainloader ${vtoy_path}/ventoy_x64.efi env_param=${env_param} isoefi=${LoadIsoEfiDriver} FirstTry=${FirstTryBootFile} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size} + chainloader ${vtoy_path}/ventoy_${VTOY_EFI_ARCH}.efi env_param=${env_param} isoefi=${LoadIsoEfiDriver} FirstTry=${FirstTryBootFile} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size} boot else echo "chain empty failed" @@ -531,11 +592,12 @@ function uefi_linux_menu_func { } function uefi_unix_menu_func { - ventoy_unix_comm_proc $1 ${chosen_path} + ventoy_unix_comm_proc $1 "${chosen_path}" if [ -n "$vtoy_chain_mem_addr" ]; then + ventoy_acpi_param ${vtoy_chain_mem_addr} 2048 ventoy_cli_console - chainloader ${vtoy_path}/ventoy_x64.efi env_param=${env_param} isoefi=${LoadIsoEfiDriver} FirstTry=${FirstTryBootFile} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size} + chainloader ${vtoy_path}/ventoy_${VTOY_EFI_ARCH}.efi env_param=${env_param} isoefi=${LoadIsoEfiDriver} FirstTry=${FirstTryBootFile} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size} boot else echo "chain empty failed" @@ -558,18 +620,18 @@ function uefi_iso_menu_func { unset LoadIsoEfiDriver fi - set chosen_path=$2 - vt_select_auto_install ${chosen_path} - vt_select_persistence ${chosen_path} + set chosen_path="$2" + vt_select_auto_install "${chosen_path}" + vt_select_persistence "${chosen_path}" - if vt_is_udf ${1}${chosen_path}; then + if vt_is_udf "${1}${chosen_path}"; then set ventoy_fs_probe=udf else set ventoy_fs_probe=iso9660 vt_iso9660_nojoliet 0 fi - loopback loop ${1}${chosen_path} + loopback loop "${1}${chosen_path}" get_os_type (loop) if [ -d (loop)/EFI ]; then @@ -586,18 +648,22 @@ function uefi_iso_menu_func { elif vt_check_mode 1; then set ventoy_compatible=YES else - vt_check_compatible (loop) + vt_check_compatible (loop) fi - vt_img_sector ${1}${chosen_path} + vt_img_sector "${1}${chosen_path}" + + if [ "$ventoy_fs_probe" = "iso9660" ]; then + vt_select_conf_replace "${1}" "${chosen_path}" + fi if [ "$vtoy_os" = "Windows" ]; then vt_check_compatible_pe (loop) - uefi_windows_menu_func $1 ${chosen_path} + uefi_windows_menu_func "$1" "${chosen_path}" elif [ "$vtoy_os" = "Unix" ]; then - uefi_unix_menu_func $1 ${chosen_path} + uefi_unix_menu_func "$1" "${chosen_path}" else - uefi_linux_menu_func $1 ${chosen_path} + uefi_linux_menu_func "$1" "${chosen_path}" fi ventoy_gui_console @@ -605,10 +671,10 @@ function uefi_iso_menu_func { function uefi_iso_memdisk { echo 'Loading ISO file to memory ...' - vt_load_img_memdisk ${1}${2} vtoy_iso_buf + vt_load_img_memdisk "${1}${2}" vtoy_iso_buf ventoy_cli_console - chainloader ${vtoy_path}/ventoy_x64.efi memdisk env_param=${env_param} isoefi=${LoadIsoEfiDriver} ${vtdebug_flag} mem:${vtoy_iso_buf_addr}:size:${vtoy_iso_buf_size} + chainloader ${vtoy_path}/ventoy_${VTOY_EFI_ARCH}.efi memdisk env_param=${env_param} isoefi=${LoadIsoEfiDriver} ${vtdebug_flag} mem:${vtoy_iso_buf_addr}:size:${vtoy_iso_buf_size} boot ventoy_gui_console @@ -623,7 +689,7 @@ function legacy_windows_menu_func { if [ "$ventoy_fs_probe" = "iso9660" ]; then loopback -d loop vt_iso9660_nojoliet 1 - loopback loop $1$2 + loopback loop "$1$2" fi for file in "boot/bcd" "/efi/microsoft/boot/bcd" "SSTR/BCD"; do @@ -641,13 +707,12 @@ function legacy_windows_menu_func { locate_wim fi - vt_windows_chain_data ${1}${chosen_path} + vt_windows_chain_data "${1}${chosen_path}" ventoy_debug_pause if [ -n "$vtoy_chain_mem_addr" ]; then - linux16 $vtoy_path/ipxe.krn ${vtdebug_flag} ibft mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size} - set gfxmode=1920x1080,1366x768,1024x768,800x600,auto - terminal_output gfxterm + ventoy_acpi_param ${vtoy_chain_mem_addr} 2048 + linux16 $vtoy_path/ipxe.krn ${vtdebug_flag} ibft mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size} boot else echo "chain empty failed" @@ -661,10 +726,10 @@ function legacy_linux_menu_func { if [ "$ventoy_fs_probe" = "udf" ]; then loopback -d loop set ventoy_fs_probe=iso9660 - loopback loop $1$2 + loopback loop "$1$2" fi - vt_load_cpio $vtoy_path/ventoy.cpio $2 $1 "busybox=$ventoy_busybox_ver" + vt_load_cpio $vtoy_path/ventoy.cpio "$2" "$1" "busybox=$ventoy_busybox_ver" vt_linux_clear_initrd @@ -707,10 +772,11 @@ function legacy_linux_menu_func { locate_initrd fi - vt_linux_chain_data ${1}${chosen_path} + vt_linux_chain_data "${1}${chosen_path}" ventoy_debug_pause if [ -n "$vtoy_chain_mem_addr" ]; then + ventoy_acpi_param ${vtoy_chain_mem_addr} 2048 linux16 $vtoy_path/ipxe.krn ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size} boot else @@ -721,9 +787,10 @@ function legacy_linux_menu_func { function legacy_unix_menu_func { - ventoy_unix_comm_proc $1 ${chosen_path} + ventoy_unix_comm_proc $1 "${chosen_path}" if [ -n "$vtoy_chain_mem_addr" ]; then + #ventoy_acpi_param ${vtoy_chain_mem_addr} 2048 linux16 $vtoy_path/ipxe.krn ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size} boot else @@ -739,21 +806,22 @@ function legacy_iso_menu_func { loopback -d loop fi - set chosen_path=$2 - vt_select_auto_install ${chosen_path} - vt_select_persistence ${chosen_path} + set chosen_path="$2" + + vt_select_auto_install "${chosen_path}" + vt_select_persistence "${chosen_path}" - if vt_is_udf ${1}${chosen_path}; then + if vt_is_udf "${1}${chosen_path}"; then set ventoy_fs_probe=udf else set ventoy_fs_probe=iso9660 vt_iso9660_nojoliet 0 fi - loopback loop ${1}${chosen_path} + loopback loop "${1}${chosen_path}" get_os_type (loop) - + if [ -n "$vtcompat" ]; then set ventoy_compatible=YES unset vtcompat @@ -763,15 +831,19 @@ function legacy_iso_menu_func { vt_check_compatible (loop) fi - vt_img_sector ${1}${chosen_path} + vt_img_sector "${1}${chosen_path}" + + if [ "$ventoy_fs_probe" = "iso9660" ]; then + vt_select_conf_replace "${1}" "${chosen_path}" + fi if [ "$vtoy_os" = "Windows" ]; then vt_check_compatible_pe (loop) - legacy_windows_menu_func $1 ${chosen_path} + legacy_windows_menu_func "$1" "${chosen_path}" elif [ "$vtoy_os" = "Unix" ]; then - legacy_unix_menu_func $1 ${chosen_path} + legacy_unix_menu_func "$1" "${chosen_path}" else - legacy_linux_menu_func $1 ${chosen_path} + legacy_linux_menu_func "$1" "${chosen_path}" fi } @@ -779,7 +851,7 @@ function legacy_iso_memdisk { linux16 $vtoy_path/memdisk iso raw echo "Loading ISO file to memory ..." - initrd16 ${1}${2} + initrd16 "${1}${2}" boot } @@ -789,11 +861,11 @@ function iso_endless_os_proc { loopback -d loop fi - loopback loop ${1}${2} - vt_img_sector ${1}${2} + loopback loop "${1}${2}" + vt_img_sector "${1}${2}" - vt_load_cpio $vtoy_path/ventoy.cpio $2 $1 "busybox=$ventoy_busybox_ver" - vt_trailer_cpio $1 $2 noinit + vt_load_cpio $vtoy_path/ventoy.cpio "$2" "$1" "busybox=$ventoy_busybox_ver" + vt_trailer_cpio "$1" "$2" noinit ventoy_debug_pause @@ -815,18 +887,23 @@ function iso_endless_os_proc { function ventoy_iso_busybox_ver { - set ventoy_busybox_ver=32 + + if [ "$VTOY_EFI_ARCH" = "aa64" ]; then + set ventoy_busybox_ver=a64 + else + set ventoy_busybox_ver=32 - #special process for deepin-live iso - if [ "$vt_chosen_size" = "403701760" ]; then - if vt_str_str $vt_chosen_path "/deepin-live"; then + #special process for deepin-live iso + if [ "$vt_chosen_size" = "403701760" ]; then + if vt_str_str "$vt_chosen_path" "/deepin-live"; then + set ventoy_busybox_ver=64 + fi + elif vt_str_begin "$vt_volume_id" "PHOTON_"; then + set ventoy_busybox_ver=64 + elif vt_str_begin "$vt_volume_id" "smgl-test-quinq-x86_64"; then set ventoy_busybox_ver=64 + fi - elif vt_str_begin $vt_volume_id "PHOTON_"; then - set ventoy_busybox_ver=64 - elif vt_str_begin $vt_volume_id "smgl-test-quinq-x86_64"; then - set ventoy_busybox_ver=64 - fi } @@ -835,28 +912,36 @@ function iso_common_menuentry { unset vt_volume_id vt_chosen_img_path vt_chosen_path vt_chosen_size - vt_parse_iso_volume ${vtoy_iso_part}${vt_chosen_path} vt_system_id vt_volume_id + vt_parse_iso_volume "${vtoy_iso_part}${vt_chosen_path}" vt_system_id vt_volume_id + + if vt_check_password "${vt_chosen_path}"; then + return + fi + + if vt_str_begin "$vt_volume_id" "Avira"; then + vt_skip_svd "${vtoy_iso_part}${vt_chosen_path}" + fi ventoy_iso_busybox_ver #special process for Endless OS - if vt_str_begin $vt_volume_id "Endless-OS"; then - iso_endless_os_proc $vtoy_iso_part $vt_chosen_path - elif vt_str_begin $vt_volume_id "TENS-Public"; then + if vt_str_begin "$vt_volume_id" "Endless-OS"; then + iso_endless_os_proc $vtoy_iso_part "$vt_chosen_path" + elif vt_str_begin "$vt_volume_id" "TENS-Public"; then set vtcompat=1 fi if [ "$grub_platform" = "pc" ]; then if vt_check_mode 0; then - legacy_iso_memdisk $vtoy_iso_part $vt_chosen_path + legacy_iso_memdisk $vtoy_iso_part "$vt_chosen_path" else - legacy_iso_menu_func $vtoy_iso_part $vt_chosen_path + legacy_iso_menu_func $vtoy_iso_part "$vt_chosen_path" fi else if vt_check_mode 0; then - uefi_iso_memdisk $vtoy_iso_part $vt_chosen_path + uefi_iso_memdisk $vtoy_iso_part "$vt_chosen_path" else - uefi_iso_menu_func $vtoy_iso_part $vt_chosen_path + uefi_iso_menu_func $vtoy_iso_part "$vt_chosen_path" fi fi } @@ -864,10 +949,18 @@ function iso_common_menuentry { function miso_common_menuentry { vt_chosen_img_path vt_chosen_path vt_chosen_size + if vt_check_password "${vt_chosen_path}"; then + return + fi + + echo "memdisk mode boot for $vt_chosen_path" + echo "" + ventoy_debug_pause + if [ "$grub_platform" = "pc" ]; then - legacy_iso_memdisk $vtoy_iso_part $vt_chosen_path + legacy_iso_memdisk $vtoy_iso_part "$vt_chosen_path" else - uefi_iso_memdisk $vtoy_iso_part $vt_chosen_path + uefi_iso_memdisk $vtoy_iso_part "$vt_chosen_path" fi } @@ -889,18 +982,26 @@ function iso_unsupport_menuentry { function wim_common_menuentry { vt_chosen_img_path vt_chosen_path vt_chosen_size - vt_wim_chain_data ${vtoy_iso_part}${vt_chosen_path} + + if vt_check_password "${vt_chosen_path}"; then + return + fi + + if vt_wim_check_bootable "${vtoy_iso_part}${vt_chosen_path}"; then + vt_wim_chain_data "${vtoy_iso_part}${vt_chosen_path}" + else + echo -e "\n This is NOT a bootable WIM file. \n" + echo -e " 这不是一个可启动的 WIM 文件。\n" + fi ventoy_debug_pause if [ -n "$vtoy_chain_mem_addr" ]; then if [ "$grub_platform" = "pc" ]; then - linux16 $vtoy_path/ipxe.krn ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size} - set gfxmode=1920x1080,1366x768,1024x768,800x600,auto - terminal_output gfxterm + linux16 $vtoy_path/ipxe.krn ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size} else ventoy_cli_console - chainloader ${vtoy_path}/ventoy_x64.efi env_param=${env_param} isoefi=${LoadIsoEfiDriver} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size} + chainloader ${vtoy_path}/ventoy_${VTOY_EFI_ARCH}.efi env_param=${env_param} isoefi=${LoadIsoEfiDriver} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size} ventoy_gui_console fi boot @@ -917,19 +1018,23 @@ function wim_unsupport_menuentry { function efi_common_menuentry { vt_chosen_img_path vt_chosen_path vt_chosen_size - vt_concat_efi_iso ${vtoy_iso_part}${vt_chosen_path} vtoy_iso_buf + if vt_check_password "${vt_chosen_path}"; then + return + fi + + vt_concat_efi_iso "${vtoy_iso_part}${vt_chosen_path}" vtoy_iso_buf ventoy_debug_pause ventoy_cli_console unset vtoy_dotefi_retry - chainloader ${vtoy_path}/ventoy_x64.efi memdisk env_param=${env_param} dotefi isoefi=on ${vtdebug_flag} mem:${vtoy_iso_buf_addr}:size:${vtoy_iso_buf_size} + chainloader ${vtoy_path}/ventoy_${VTOY_EFI_ARCH}.efi memdisk env_param=${env_param} dotefi isoefi=on ${vtdebug_flag} mem:${vtoy_iso_buf_addr}:size:${vtoy_iso_buf_size} boot if [ -n "$vtoy_dotefi_retry" ]; then unset vtoy_dotefi_retry - chainloader ${vtoy_iso_part}${vt_chosen_path} + chainloader "${vtoy_iso_part}${vt_chosen_path}" boot fi @@ -940,7 +1045,6 @@ function efi_unsupport_menuentry { common_unsupport_menuentry } - function vhd_common_menuentry { if [ "$VTOY_VHD_NO_WARNING" != "1" ]; then @@ -954,26 +1058,28 @@ function vhd_common_menuentry { fi vt_chosen_img_path vt_chosen_path vt_chosen_size - vt_patch_vhdboot ${vtoy_iso_part} ${vt_chosen_path} + + if vt_check_password "${vt_chosen_path}"; then + return + fi + + vt_patch_vhdboot "$vt_chosen_path" ventoy_debug_pause if [ -n "$vtoy_vhd_buf_addr" ]; then if [ "$grub_platform" = "pc" ]; then linux16 $vtoy_path/memdisk iso raw - initrd16 mem:${vtoy_vhd_buf_addr}:size:${vtoy_vhd_buf_size} - - set gfxmode=1920x1080,1366x768,1024x768,800x600,auto - terminal_output gfxterm + initrd16 mem:${vtoy_vhd_buf_addr}:size:${vtoy_vhd_buf_size} boot else ventoy_cli_console - chainloader ${vtoy_path}/ventoy_x64.efi memdisk env_param=${env_param} isoefi=${LoadIsoEfiDriver} ${vtdebug_flag} mem:${vtoy_vhd_buf_addr}:size:${vtoy_vhd_buf_size} + chainloader ${vtoy_path}/ventoy_${VTOY_EFI_ARCH}.efi memdisk env_param=${env_param} isoefi=${LoadIsoEfiDriver} ${vtdebug_flag} mem:${vtoy_vhd_buf_addr}:size:${vtoy_vhd_buf_size} boot ventoy_gui_console fi else - echo "Failed to boot vhd file" + echo "Please put the right ventoy_vhdboot.img file to the 1st partition" ventoy_pause fi } @@ -982,6 +1088,76 @@ function vhd_unsupport_menuentry { common_unsupport_menuentry } +function vtoyboot_common_func { + set AltBootPart=0 + set vtoysupport=0 + + vt_get_vtoy_type "${1}" vtoytype parttype AltBootPart + + if vt_str_begin $vtoytype vhd; then + set vtoysupport=1 + elif [ "$vtoytype" = "raw" ]; then + set vtoysupport=1 + elif [ "$vtoytype" = "vdi" ]; then + set vtoysupport=1 + fi + + if [ $vtoysupport -eq 1 ]; then + if [ "$grub_platform" = "pc" ]; then + if [ "$parttype" = "gpt" -a $AltBootPart -eq 0 ]; then + echo "The OS in the vdisk was created in UEFI mode, but current is Legacy BIOS mode." + echo "虚拟磁盘内的系统是在UEFI模式下创建的，而当前系统是Legacy BIOS模式，可能无法正常启动。" + ventoy_pause + fi + else + if [ "$parttype" = "mbr" -a $AltBootPart -eq 0 ]; then + echo "The OS in the vdisk was created in Legacy BIOS mode, but current is UEFI mode." + echo "虚拟磁盘内的系统是在Legacy BIOS模式下创建的，而当前系统是UEFI模式，可能无法正常启动。" + ventoy_pause + fi + fi + + vt_img_sector "${1}" + vt_raw_chain_data "${1}" + + ventoy_debug_pause + + if [ -n "$vtoy_chain_mem_addr" ]; then + if [ "$grub_platform" = "pc" ]; then + vt_acpi_param ${vtoy_chain_mem_addr} 512 + linux16 $vtoy_path/ipxe.krn ${vtdebug_flag} bios80 sector512 mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size} + boot + else + ventoy_acpi_param ${vtoy_chain_mem_addr} 512 + ventoy_cli_console + chainloader ${vtoy_path}/ventoy_${VTOY_EFI_ARCH}.efi sector512 env_param=${ventoy_env_param} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size} + boot + ventoy_gui_console + fi + else + echo "chain empty failed!" + ventoy_pause + fi + else + echo "Unsupported vtoy type $vtoytype" + ventoy_pause + fi +} + +function vtoy_common_menuentry { + vt_chosen_img_path vt_chosen_path vt_chosen_size + + if vt_check_password "${vt_chosen_path}"; then + return + fi + + vtoyboot_common_func "${vtoy_iso_part}${vt_chosen_path}" +} + +function vtoy_unsupport_menuentry { + common_unsupport_menuentry +} + # #============================================================# # IMG file boot process # @@ -990,8 +1166,8 @@ function vhd_unsupport_menuentry { function ventoy_img_easyos { - vt_load_cpio $vtoy_path/ventoy.cpio ${vt_chosen_path} ${vtoy_iso_part} "busybox=$ventoy_busybox_ver" - vt_trailer_cpio ${vtoy_iso_part} ${vt_chosen_path} noinit + vt_load_cpio $vtoy_path/ventoy.cpio "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver" + vt_trailer_cpio ${vtoy_iso_part} "${vt_chosen_path}" noinit loopback easysfs (vtimghd,1)/easy.sfs vt_get_lib_module_ver (easysfs) /lib/modules/ vt_module_ver @@ -1016,8 +1192,8 @@ function ventoy_img_easyos { } function ventoy_img_volumio { - vt_load_cpio $vtoy_path/ventoy.cpio ${vt_chosen_path} ${vtoy_iso_part} "busybox=$ventoy_busybox_ver" - vt_trailer_cpio ${vtoy_iso_part} ${vt_chosen_path} noinit + vt_load_cpio $vtoy_path/ventoy.cpio "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver" + vt_trailer_cpio ${vtoy_iso_part} "${vt_chosen_path}" noinit ventoy_debug_pause @@ -1034,8 +1210,8 @@ function ventoy_img_volumio { function ventoy_img_openelec { elec_ver=$1 - vt_load_cpio $vtoy_path/ventoy.cpio ${vt_chosen_path} ${vtoy_iso_part} "busybox=$ventoy_busybox_ver" - vt_trailer_cpio ${vtoy_iso_part} ${vt_chosen_path} noinit + vt_load_cpio $vtoy_path/ventoy.cpio "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver" + vt_trailer_cpio ${vtoy_iso_part} "${vt_chosen_path}" noinit loopback vtloopex $vtoy_efi_part/ventoy/vtloopex.cpio vt_img_extra_initrd_append (vtloopex)/$elec_ver/vtloopex.tar.xz @@ -1056,8 +1232,8 @@ function ventoy_img_openelec { function ventoy_img_freedombox { - vt_load_cpio $vtoy_path/ventoy.cpio ${vt_chosen_path} ${vtoy_iso_part} "busybox=$ventoy_busybox_ver" - vt_trailer_cpio ${vtoy_iso_part} ${vt_chosen_path} noinit + vt_load_cpio $vtoy_path/ventoy.cpio "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver" + vt_trailer_cpio ${vtoy_iso_part} "${vt_chosen_path}" noinit vt_get_lib_module_ver (vtimghd,1) /lib/modules/ vt_module_ver if [ -n "$vt_module_ver" ]; then @@ -1077,8 +1253,8 @@ function ventoy_img_freedombox { } function ventoy_img_paldo { - vt_load_cpio $vtoy_path/ventoy.cpio ${vt_chosen_path} ${vtoy_iso_part} "busybox=$ventoy_busybox_ver" - vt_trailer_cpio ${vtoy_iso_part} ${vt_chosen_path} noinit + vt_load_cpio $vtoy_path/ventoy.cpio "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver" + vt_trailer_cpio ${vtoy_iso_part} "${vt_chosen_path}" noinit ventoy_debug_pause @@ -1099,8 +1275,8 @@ function ventoy_img_paldo { } function ventoy_img_ubos { - vt_load_cpio $vtoy_path/ventoy.cpio ${vt_chosen_path} ${vtoy_iso_part} "busybox=$ventoy_busybox_ver" - vt_trailer_cpio ${vtoy_iso_part} ${vt_chosen_path} noinit + vt_load_cpio $vtoy_path/ventoy.cpio "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver" + vt_trailer_cpio ${vtoy_iso_part} "${vt_chosen_path}" noinit vt_get_lib_module_ver (vtimghd,3) /lib/modules/ vt_module_ver if [ -n "$vt_module_ver" ]; then @@ -1123,8 +1299,8 @@ function ventoy_img_ubos { } function ventoy_img_recalbox { - vt_load_cpio $vtoy_path/ventoy.cpio ${vt_chosen_path} ${vtoy_iso_part} "busybox=$ventoy_busybox_ver" - vt_trailer_cpio ${vtoy_iso_part} ${vt_chosen_path} noinit + vt_load_cpio $vtoy_path/ventoy.cpio "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver" + vt_trailer_cpio ${vtoy_iso_part} "${vt_chosen_path}" noinit ventoy_debug_pause @@ -1140,8 +1316,8 @@ function ventoy_img_recalbox { } function ventoy_img_batocera { - vt_load_cpio $vtoy_path/ventoy.cpio ${vt_chosen_path} ${vtoy_iso_part} "busybox=$ventoy_busybox_ver" - vt_trailer_cpio ${vtoy_iso_part} ${vt_chosen_path} noinit + vt_load_cpio $vtoy_path/ventoy.cpio "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver" + vt_trailer_cpio ${vtoy_iso_part} "${vt_chosen_path}" noinit ventoy_debug_pause @@ -1173,13 +1349,17 @@ function img_common_menuentry { set ventoy_busybox_ver=32 vt_chosen_img_path vt_chosen_path vt_chosen_size + + if vt_check_password "${vt_chosen_path}"; then + return + fi if [ -d (vtimghd)/ ]; then loopback -d vtimghd fi - loopback vtimghd ${vtoy_iso_part}${vt_chosen_path} - vt_img_sector ${vtoy_iso_part}${vt_chosen_path} + loopback vtimghd "${vtoy_iso_part}${vt_chosen_path}" + vt_img_sector "${vtoy_iso_part}${vt_chosen_path}" vt_img_part_info (vtimghd) @@ -1223,11 +1403,13 @@ function img_common_menuentry { ventoy_img_memtest86 fi else + vt_linux_chain_data "${vtoy_iso_part}${vt_chosen_path}" + ventoy_acpi_param ${vtoy_chain_mem_addr} 512 if [ "$grub_platform" = "pc" ]; then - img_unsupport_tip - else - vt_linux_chain_data ${vtoy_iso_part}${vt_chosen_path} - chainloader ${vtoy_path}/ventoy_x64.efi sector512 env_param=${env_param} isoefi=${LoadIsoEfiDriver} FirstTry=${FirstTryBootFile} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size} + linux16 $vtoy_path/ipxe.krn ${vtdebug_flag} sector512 mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size} + boot + else + chainloader ${vtoy_path}/ventoy_${VTOY_EFI_ARCH}.efi sector512 env_param=${env_param} isoefi=${LoadIsoEfiDriver} FirstTry=${FirstTryBootFile} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size} boot fi fi @@ -1250,7 +1432,10 @@ function img_unsupport_menuentry { ############################################################# ############################################################# -set VENTOY_VERSION="1.0.20" +set VENTOY_VERSION="1.0.30" + +#ACPI not compatible with Window7/8, so disable by default +set VTOY_PARAM_NO_ACPI=1 # Default menu display mode, you can change it as you want. # 0: List mode @@ -1269,7 +1454,14 @@ set VTOY_F6_CMD="ventoy_ext_menu" if [ "$grub_platform" = "pc" ]; then set VTOY_TEXT_MENU_VER="Ventoy $VENTOY_VERSION BIOS www.ventoy.net" else - set VTOY_TEXT_MENU_VER="Ventoy $VENTOY_VERSION UEFI www.ventoy.net" + set VTOY_TEXT_MENU_VER="Ventoy $VENTOY_VERSION UEFI www.ventoy.net" + if [ "$grub_cpu" = "i386" ]; then + set VTOY_EFI_ARCH=ia32 + elif [ "$grub_cpu" = "arm64" ]; then + set VTOY_EFI_ARCH=aa64 + else + set VTOY_EFI_ARCH=x64 + fi fi vt_device $root vtoy_dev @@ -1277,16 +1469,17 @@ vt_device $root vtoy_dev if [ "$vtoy_dev" = "tftp" ]; then set vtoy_path=($root) for vtid in 0 1 2 3; do - if [ -d (hd$vtid,2)/ventoy ]; then + if [ -f (hd$vtid,2)/ventoy/ventoy.cpio ]; then set vtoy_iso_part=(hd$vtid,1) set vtoy_efi_part=(hd$vtid,2) + set vtoydev=hd$vtid break fi done loadfont ascii if [ -f $vtoy_iso_part/ventoy/ventoy.json ]; then - set vt_plugin_path=$vtoy_iso_part + set vt_plugin_path=$vtoy_iso_part else set vt_plugin_path=$prefix vt_load_plugin $vt_plugin_path @@ -1298,15 +1491,19 @@ else set vtoy_path=($root)/ventoy fi + set vtoydev=$vtoy_dev set vtoy_iso_part=($vtoy_dev,1) set vtoy_efi_part=($vtoy_dev,2) loadfont unicode set vt_plugin_path=$vtoy_iso_part fi +#Load Partition Table +vt_load_part_table $vtoydev #Load Plugin if [ -f $vtoy_iso_part/ventoy/ventoy.json ]; then + clear vt_load_plugin $vtoy_iso_part fi @@ -1331,19 +1528,22 @@ fi 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 F4:Localboot F5:Debug F6:ExMenu" + set VTOY_HOTKEY_TIP="F1:Memdisk F2:Power F3:TreeView F4:Localboot F5:Tools F6:ExMenu" else set VTOY_F3_CMD="vt_dynamic_menu 1 0" - set VTOY_HOTKEY_TIP="F1:Memdisk F2:Power F3:ListView F4:Localboot F5:Debug F6:ExMenu" + set VTOY_HOTKEY_TIP="F1:Memdisk F2:Power F3:ListView F4:Localboot F5:Tools F6:ExMenu" fi if [ -n "$vtoy_gfxmode" ]; then set gfxmode=$vtoy_gfxmode + set gfxpayload=keep else - set gfxmode=1920x1080,1366x768,1024x768,800x600,auto + set gfxmode=1024x768 + set gfxpayload=keep fi + if [ "$vtoy_display_mode" = "CLI" ]; then terminal_output console elif [ "$vtoy_display_mode" = "serial" ]; then @@ -1367,16 +1567,56 @@ else terminal_output gfxterm fi + +if [ -n "$VTOY_PLUGIN_SYNTAX_ERROR" ]; then + clear + echo -e "\n Syntax error detected in ventoy.json, please check! \n" + echo -e " ventoy.json 文件中有语法错误，所有配置都不会生效，请检查！\n" + echo -e "\n press ENTER to continue (请按 回车 键继续) ..." + read vtInputKey +fi + #export necessary variable export theme export gfxmode -export vtoy_dev +export gfxpayload +export vtoydev +export vtoy_path +export vtdebug_flag export vtoy_iso_part export vtoy_efi_part export VENTOY_VERSION +export VTOY_CUR_VIDEO_MODE +export VTOY_EFI_ARCH - - +#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