X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/8c192a1807c3d69acea241b269febd608296a2bc..bfe194c190597ff9a77efc76a21c441bc19b6549:/INSTALL/grub/grub.cfg diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg index ac0ccde..3e1528f 100644 --- a/INSTALL/grub/grub.cfg +++ b/INSTALL/grub/grub.cfg @@ -46,7 +46,7 @@ function ventoy_gui_console { function ventoy_acpi_param { if [ "$VTOY_PARAM_NO_ACPI" != "1" ]; then - vt_acpi_param $1 $2 + vt_acpi_param "$1" "$2" fi } @@ -106,13 +106,13 @@ function get_os_type { fi if [ -n "${vtdebug_flag}" ]; then - echo ISO is $vtoy_os + echo ISO is "$vtoy_os" fi } function vt_check_compatible_pe { #Check for PE without external tools - if [ -f $1/HBCD_PE.ini ]; then + if [ -f "$1/HBCD_PE.ini" ]; then set ventoy_compatible=YES fi } @@ -200,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 } @@ -256,7 +256,7 @@ 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 @@ -270,6 +270,8 @@ function distro_specify_initrd_file_phase2 { 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)/blackarch/boot/x86_64/initramfs-linux.img ]; then + vt_linux_specify_initrd_file /blackarch/boot/x86_64/initramfs-linux.img elif [ -f (loop)/install.amd/initrd.gz ]; then vt_linux_specify_initrd_file /live/initrd2.img @@ -277,13 +279,18 @@ function distro_specify_initrd_file_phase2 { 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 - + elif [ -f (loop)/austrumi/initrd.gz ]; then + vt_linux_specify_initrd_file /austrumi/initrd.gz + if [ -f (loop)/EFI/BOOT/bootx64.efi ]; then + vt_cpio_busybox64 "64h" + fi + 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 @@ -314,6 +321,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 } @@ -322,11 +344,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 @@ -338,7 +362,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 @@ -387,7 +411,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 @@ -399,7 +423,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 { @@ -409,7 +433,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" @@ -422,7 +446,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 } @@ -435,7 +459,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 @@ -451,13 +475,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" @@ -472,10 +496,10 @@ function uefi_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 @@ -526,6 +550,12 @@ function uefi_linux_menu_func { elif [ -d (loop)/blackarch ]; then if [ -f (loop)/blackarch/boot/x86_64/archiso.img ]; then vt_add_replace_file $vtindex "EFI\\archiso\\archiso.img" + elif [ -f (loop)/blackarch/boot/x86_64/initramfs-linux.img ]; then + vt_add_replace_file $vtindex "blackarch\\boot\\x86_64\\initramfs-linux.img" + fi + elif [ -d (loop)/anarchy ]; then + if [ -f (loop)/anarchy/boot/x86_64/initramfs-linux.img ]; then + vt_add_replace_file $vtindex "anarchy\\boot\\x86_64\\initramfs-linux.img" fi elif [ -d (loop)/parabola ]; then if [ -f (loop)/parabola/boot/x86_64/parabolaiso.img ]; then @@ -561,12 +591,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" @@ -575,12 +605,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" @@ -603,18 +633,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 @@ -634,19 +664,19 @@ function uefi_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} + 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 @@ -654,10 +684,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 @@ -672,7 +702,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 @@ -690,7 +720,7 @@ 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 @@ -709,10 +739,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 @@ -731,6 +761,8 @@ function legacy_linux_menu_func { if [ -d (loop)/arch/boot/syslinux ]; then vt_linux_parse_initrd_isolinux (loop)/arch/boot/syslinux/ /arch/ vt_linux_parse_initrd_isolinux (loop)/arch/boot/syslinux/ /arch/boot/syslinux/ + elif [ -d (loop)/anarchy/boot/syslinux ]; then + vt_linux_parse_initrd_isolinux (loop)/anarchy/boot/syslinux/ /anarchy/ #manjaro elif [ -d (loop)/manjaro ]; then @@ -755,7 +787,7 @@ 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 @@ -770,7 +802,7 @@ 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 @@ -789,18 +821,19 @@ 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) @@ -813,19 +846,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} + 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 } @@ -833,7 +866,7 @@ function legacy_iso_memdisk { linux16 $vtoy_path/memdisk iso raw echo "Loading ISO file to memory ..." - initrd16 ${1}${2} + initrd16 "${1}${2}" boot } @@ -843,11 +876,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 @@ -869,18 +902,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 } @@ -889,28 +927,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 } @@ -918,14 +964,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 } @@ -947,7 +997,17 @@ 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 @@ -956,7 +1016,7 @@ function wim_common_menuentry { 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 @@ -973,19 +1033,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 @@ -1009,7 +1073,12 @@ function vhd_common_menuentry { fi vt_chosen_img_path vt_chosen_path vt_chosen_size - vt_patch_vhdboot $vt_chosen_path + + if vt_check_password "${vt_chosen_path}"; then + return + fi + + vt_patch_vhdboot "$vt_chosen_path" ventoy_debug_pause @@ -1020,7 +1089,7 @@ function vhd_common_menuentry { 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 @@ -1038,7 +1107,7 @@ function vtoyboot_common_func { set AltBootPart=0 set vtoysupport=0 - vt_get_vtoy_type ${1} vtoytype parttype AltBootPart + vt_get_vtoy_type "${1}" vtoytype parttype AltBootPart if vt_str_begin $vtoytype vhd; then set vtoysupport=1 @@ -1063,8 +1132,8 @@ function vtoyboot_common_func { fi fi - vt_img_sector ${1} - vt_raw_chain_data ${1} + vt_img_sector "${1}" + vt_raw_chain_data "${1}" ventoy_debug_pause @@ -1076,7 +1145,7 @@ function vtoyboot_common_func { else ventoy_acpi_param ${vtoy_chain_mem_addr} 512 ventoy_cli_console - chainloader ${vtoy_path}/ventoy_x64.efi sector512 env_param=${ventoy_env_param} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size} + 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 @@ -1091,8 +1160,13 @@ function vtoyboot_common_func { } function vtoy_common_menuentry { - vt_chosen_img_path vt_chosen_path vt_chosen_size - vtoyboot_common_func ${vtoy_iso_part}${vt_chosen_path} + 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 { @@ -1107,8 +1181,8 @@ function vtoy_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 @@ -1133,8 +1207,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 @@ -1151,8 +1225,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 @@ -1173,8 +1247,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 @@ -1194,8 +1268,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 @@ -1216,8 +1290,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 @@ -1240,8 +1314,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 @@ -1257,8 +1331,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 @@ -1290,13 +1364,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) @@ -1319,15 +1397,15 @@ function img_common_menuentry { ventoy_img_easyos elif [ -e (vtimghd,1)/volumio.initrd ]; then ventoy_img_volumio - elif vt_str_begin $vtImgHd1Label "LAKKA"; then + elif vt_str_begin "$vtImgHd1Label" "LAKKA"; then ventoy_img_openelec lakka - elif vt_str_begin $vtImgHd1Label "LIBREELEC"; then + elif vt_str_begin "$vtImgHd1Label" "LIBREELEC"; then ventoy_img_openelec LibreELEC - elif vt_str_begin $vtImgHd1Label "paldo-live"; then + elif vt_str_begin "$vtImgHd1Label" "paldo-live"; then ventoy_img_paldo - elif vt_str_begin $vtImgHostname "freedombox"; then + elif vt_str_begin "$vtImgHostname" "freedombox"; then ventoy_img_freedombox - elif vt_str_begin $vtImgHd1Label "BATOCERA"; then + elif vt_str_begin "$vtImgHd1Label" "BATOCERA"; then ventoy_img_batocera elif [ "$vtImgHd2Label" = "RECALBOX" ]; then ventoy_img_recalbox @@ -1340,13 +1418,13 @@ function img_common_menuentry { ventoy_img_memtest86 fi else - vt_linux_chain_data ${vtoy_iso_part}${vt_chosen_path} + vt_linux_chain_data "${vtoy_iso_part}${vt_chosen_path}" ventoy_acpi_param ${vtoy_chain_mem_addr} 512 if [ "$grub_platform" = "pc" ]; then linux16 $vtoy_path/ipxe.krn ${vtdebug_flag} sector512 mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size} boot else - 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} + 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 @@ -1369,7 +1447,7 @@ function img_unsupport_menuentry { ############################################################# ############################################################# -set VENTOY_VERSION="1.0.28" +set VENTOY_VERSION="1.0.31" #ACPI not compatible with Window7/8, so disable by default set VTOY_PARAM_NO_ACPI=1 @@ -1390,8 +1468,17 @@ 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" +else + if [ "$grub_cpu" = "i386" ]; then + set VTOY_EFI_ARCH=ia32 + set VTOY_TEXT_MENU_VER="Ventoy $VENTOY_VERSION IA32 www.ventoy.net" + elif [ "$grub_cpu" = "arm64" ]; then + set VTOY_EFI_ARCH=aa64 + set VTOY_TEXT_MENU_VER="Ventoy $VENTOY_VERSION AA64 www.ventoy.net" + else + set VTOY_EFI_ARCH=x64 + set VTOY_TEXT_MENU_VER="Ventoy $VENTOY_VERSION UEFI www.ventoy.net" + fi fi vt_device $root vtoy_dev @@ -1433,7 +1520,9 @@ vt_load_part_table $vtoydev #Load Plugin if [ -f $vtoy_iso_part/ventoy/ventoy.json ]; then + clear vt_load_plugin $vtoy_iso_part + clear fi if [ -n "$VTOY_MENU_TIMEOUT" ]; then @@ -1516,6 +1605,7 @@ 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