X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/d02f184a8de1a49db423c9539e468941ab565847..042ca4b5e36ffbe5897083e7bce2cf76dc145efd:/INSTALL/grub/grub.cfg diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg index 9b2a6fe..d05e42a 100644 --- a/INSTALL/grub/grub.cfg +++ b/INSTALL/grub/grub.cfg @@ -44,6 +44,27 @@ function ventoy_gui_console { fi } +function ventoy_acpi_param { + if [ "$VTOY_PARAM_NO_ACPI" != "1" ]; then + vt_acpi_param "$1" "$2" + fi +} + +function ventoy_vcfg_proc { + if vt_check_custom_boot "${1}" vt_vcfg; then + set vtoy_chosen_path="${1}" + vt_file_basefile "${vtoy_chosen_path}" vtoy_chosen_file + + export vtoy_chosen_path + export vtoy_chosen_file + ventoy_debug_pause + configfile "${vtoy_iso_part}${vt_vcfg}" + true + else + false + fi +} + function ventoy_power { configfile $prefix/power.cfg } @@ -53,7 +74,7 @@ function ventoy_diagnosis { configfile $prefix/debug.cfg } -function ventoy_localboot { +function ventoy_localboot { configfile $prefix/localboot.cfg } @@ -86,6 +107,9 @@ function get_os_type { elif [ -e (loop)/bin/freebsd-version ]; then set vtoy_os=Unix set vt_unix_type=FreeBSD + elif vt_str_begin "$vt_system_id" "DragonFly"; then + set vtoy_os=Unix + set vt_unix_type=DragonFly elif [ -e (loop)/boot/kernel/kernel ]; then @@ -100,13 +124,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 } @@ -194,7 +218,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 } @@ -224,6 +248,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 @@ -245,7 +274,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 @@ -257,17 +286,40 @@ function distro_specify_initrd_file_phase2 { 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)/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 + 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 + 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 + elif [ -f (loop)/boot/initfs.x86_64-efi ]; then + vt_linux_specify_initrd_file /boot/initfs.x86_64-efi + if [ -f (loop)/boot/initfs.i386-pc ]; then + vt_linux_specify_initrd_file /boot/initfs.i386-pc + fi + elif [ -f (loop)/antiX/initrd.gz ]; then + vt_linux_specify_initrd_file /antiX/initrd.gz + elif [ -f (loop)/360Disk/initrd.gz ]; then + vt_linux_specify_initrd_file /360Disk/initrd.gz + elif [ -f (loop)/porteus/initrd.xz ]; then + vt_linux_specify_initrd_file /porteus/initrd.xz + fi } function ventoy_get_ghostbsd_ver { - - # 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 - - set vt_freebsd_ver=12.x + # fallback to parse version from elf /boot/kernel/kernel + set vt_freebsd_ver=xx } function ventoy_get_furybsd_ver { @@ -293,19 +345,43 @@ 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 + if vt_str_begin "$vt_volume_id" "1_"; then + set vt_freebsd_ver=11.x + elif vt_str_begin "$vt_volume_id" "2_"; then + set vt_freebsd_ver=2.x + elif vt_str_begin "$vt_volume_id" "3_"; then + set vt_freebsd_ver=3.x + fi } function ventoy_freebsd_proc { set vtFreeBsdDistro=FreeBSD + set vt_freebsd_ver=xx 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 @@ -317,7 +393,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 @@ -347,8 +423,11 @@ function ventoy_freebsd_proc { fi elif vt_strstr "${chosen_path}" "MidnightBSD"; then set vt_freebsd_ver=9.x - else - set vt_freebsd_ver=12.x + fi + + + if [ -e (loop)/usr/freebsd-dist/cloninst.sh ]; then + set vtFreeBsdDistro=ClonOS fi set vt_freebsd_bit=64 @@ -359,26 +438,48 @@ function ventoy_freebsd_proc { fi break fi - done + done + + if [ "$vt_freebsd_ver" = "xx" ]; then + if [ -e (loop)/boot/kernel/kernel ]; then + vt_unix_parse_freebsd_ver_elf (loop)/boot/kernel/kernel $vt_freebsd_bit vt_freebsd_ver + fi + + if [ "$vt_freebsd_ver" = "xx" ]; then + set vt_freebsd_ver=13.x + fi + fi if [ -n "${vtdebug_flag}" ]; then - echo "This is FreeBSD $vt_freebsd_ver ${vt_freebsd_bit}bit" + echo "This is $vtFreeBsdDistro $vt_freebsd_ver ${vt_freebsd_bit}bit" 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 fi done - if [ -e (loop)/usr/freebsd-dist/cloninst.sh ]; then - set vtFreeBsdDistro=ClonOS - 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_dragonfly_proc { + + unset vt_unix_mod_path + for file in "/boot/kernel/initrd.img.gz"; do + if [ -e (loop)${file} ]; then + set vt_unix_mod_path=${file} + break + fi + done + + vt_unix_replace_ko $vt_unix_mod_path ${vtoy_path}/dragonfly.mfs.xz + vt_unix_fill_image_desc + vt_unix_gzip_new_ko + vt_unix_replace_conf DragonFly "${1}${chosen_path}" } function ventoy_unix_comm_proc { @@ -388,12 +489,13 @@ 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" = "DragonFly" ]; then + ventoy_dragonfly_proc "$1" "${chosen_path}" elif [ "$vt_unix_type" = "NetBSD" ]; then echo "NetBSD not supported" - else if [ -n "${vtdebug_flag}" ]; then echo "Unknown unix type" @@ -401,7 +503,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 } @@ -414,7 +516,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 @@ -430,12 +532,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" @@ -450,10 +553,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 "$2" "$1" "busybox=$ventoy_busybox_ver" vt_linux_clear_initrd @@ -477,6 +580,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 @@ -495,14 +599,26 @@ 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" + 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/parabola.img ]; then - vt_add_replace_file $vtindex "EFI\\parabola\\parabola.img" - elif [ -f (loop)/boot/initramfs_x86_64.img ]; then - vt_add_replace_file $vtindex "boot\\initramfs_x86_64.img" + 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" @@ -520,6 +636,8 @@ function uefi_linux_menu_func { 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" + 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" @@ -530,12 +648,59 @@ function uefi_linux_menu_func { fi - vt_linux_chain_data ${1}${chosen_path} + vt_linux_chain_data "${1}${chosen_path}" + + if [ -n "$LoadIsoEfiDriver" -a $vt_chosen_size -lt 104857600 ]; then + if [ -f (loop)/efi/clover/cloverx64.efi ]; then + unset LoadIsoEfiDriver + fi + fi if [ -n "$vtoy_chain_mem_addr" ]; then - 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} - boot + ventoy_acpi_param ${vtoy_chain_mem_addr} 2048 + ventoy_cli_console + + if vt_check_mode 3; then + ventoy_debug_pause + else + if [ "$VTOY_EFI_ARCH" != "mips" ]; then + chainloader ${vtoy_path}/ventoy_${VTOY_EFI_ARCH}.efi fallback env_param=${env_param} isoefi=${LoadIsoEfiDriver} FirstTry=${FirstTryBootFile} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size} + boot + fi + fi + + # fallback + set vtback_root=$root + vt_push_last_entry + set vtback_theme=$theme + unset theme + + vt_trailer_cpio "$vtoy_iso_part" "$vt_chosen_path" noinit + vt_set_boot_opt rdinit=/vtoy/vtoy + + set root=(loop) + set vtback_cfg_find=0 + for cfg in "/boot/grub/grub.cfg" "/EFI/BOOT/grub.cfg" "/EFI/debian/grub.cfg" "EFI/boot/grub.cfg" "efi/boot/grub.cfg" "/grub/grub.cfg" "EFI/BOOT/BOOTX64.conf"; do + if [ -e "$cfg" ]; then + set vtback_cfg_find=1 + configfile "$cfg" + break + fi + done + + if [ "$vtback_cfg_find" = "0" ]; then + echo " " + echo "No bootfile found for UEFI!" + echo "Maybe the image does not support $VTOY_EFI_ARCH UEFI" + echo " " + sleep 30 + fi + + vt_unset_boot_opt + set root=$vtback_root + set theme=$vtback_theme + vt_pop_last_entry + ventoy_gui_console else echo "chain empty failed" ventoy_pause @@ -543,11 +708,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" @@ -555,6 +721,14 @@ function uefi_unix_menu_func { fi } +function ventoy_reset_nojoliet { + if vt_str_begin "$vt_volume_id" "ARCARESCUE"; then + vt_iso9660_nojoliet 1 + else + vt_iso9660_nojoliet 0 + fi +} + function uefi_iso_menu_func { if [ -d (loop)/ ]; then @@ -570,18 +744,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 + ventoy_reset_nojoliet fi - loopback loop ${1}${chosen_path} + loopback loop "${1}${chosen_path}" get_os_type (loop) if [ -d (loop)/EFI ]; then @@ -598,18 +772,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 @@ -617,10 +795,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 @@ -635,7 +813,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 @@ -653,10 +831,11 @@ 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 + 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 @@ -671,10 +850,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 "$2" "$1" "busybox=$ventoy_busybox_ver" vt_linux_clear_initrd @@ -693,6 +872,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 @@ -717,12 +898,43 @@ 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 - linux16 $vtoy_path/ipxe.krn ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size} - boot + if vt_check_mode 3; then + ventoy_acpi_param ${vtoy_chain_mem_addr} 2048 + ventoy_cli_console + + # fallback + set vtback_root=$root + vt_push_last_entry + set vtback_theme=$theme + unset theme + + vt_trailer_cpio "$vtoy_iso_part" "$vt_chosen_path" noinit + vt_set_boot_opt rdinit=/vtoy/vtoy + + set root=(loop) + set vtback_cfg_find=0 + for cfg in "/boot/grub/grub.cfg" "/EFI/BOOT/grub.cfg" "/EFI/debian/grub.cfg" "EFI/boot/grub.cfg" "efi/boot/grub.cfg" "/grub/grub.cfg" "EFI/BOOT/BOOTX64.conf"; do + if [ -e "$cfg" ]; then + set vtback_cfg_find=1 + configfile "$cfg" + break + fi + done + + vt_unset_boot_opt + set root=$vtback_root + set theme=$vtback_theme + vt_pop_last_entry + ventoy_gui_console + else + 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 + fi else echo "chain empty failed" ventoy_pause @@ -731,9 +943,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 @@ -749,21 +962,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 + ventoy_reset_nojoliet 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 @@ -773,15 +987,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 } @@ -789,7 +1007,7 @@ function legacy_iso_memdisk { linux16 $vtoy_path/memdisk iso raw echo "Loading ISO file to memory ..." - initrd16 ${1}${2} + initrd16 "${1}${2}" boot } @@ -799,11 +1017,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 "$2" "$1" "busybox=$ventoy_busybox_ver" + vt_trailer_cpio "$1" "$2" noinit ventoy_debug_pause @@ -825,48 +1043,82 @@ 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 + elif [ "$VTOY_EFI_ARCH" = "mips" ]; then + set ventoy_busybox_ver=m64 + 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 + elif vt_str_begin "$vt_volume_id" "LDiagBootable"; 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 } + function iso_common_menuentry { unset vt_system_id 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 vt_volume_space + if [ $vt_volume_space -ne $vt_chosen_size ]; then + vt_mod $vt_chosen_size 2048 vt_chosen_size_mod + if [ $vt_chosen_size_mod -ne 0 ]; then + echo -e "\n $vt_volume_space $vt_chosen_size $vt_chosen_size_mod\n" + echo -e "\n The size of the iso file \"$vt_chosen_size\" is invalid. File corrupted ?\n" + echo -e " 此ISO文件的大小 \"$vt_chosen_size\" 有问题，请确认文件是否损坏。\n" + echo -e "\n press ENTER to exit (请按 回车 键返回) ..." + read vtInputKey + return + fi + fi + + if vt_check_password "${vt_chosen_path}"; then + return + fi + + if ventoy_vcfg_proc "${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 } @@ -874,14 +1126,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 } @@ -903,7 +1159,21 @@ 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 ventoy_vcfg_proc "${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 @@ -912,7 +1182,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 @@ -929,19 +1199,27 @@ 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 + + if ventoy_vcfg_proc "${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 @@ -965,7 +1243,16 @@ 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 + + if ventoy_vcfg_proc "${vt_chosen_path}"; then + return + fi + + vt_patch_vhdboot "$vt_chosen_path" ventoy_debug_pause @@ -976,7 +1263,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 @@ -991,45 +1278,50 @@ function vhd_unsupport_menuentry { } function vtoyboot_common_func { - set efigrubpart=0 + set AltBootPart=0 set vtoysupport=0 - vt_get_vtoy_type ${1} vtoytype parttype efigrubpart + 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 $efigrubpart -eq 0 ]; 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" ]; then + 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} + vt_img_sector "${1}" + vt_raw_chain_data "${1}" ventoy_debug_pause - if [ -n "$vtoy_chain_mem_addr" ]; then - if [ "$grub_platform" = "pc" ]; then + 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} sector512 mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size} + linux16 $vtoy_path/ipxe.krn ${vtdebug_flag} bios80 sector512 mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size} boot else + if vt_check_secureboot_var; then + vt_acpi_param ${vtoy_chain_mem_addr} 512 + fi 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 @@ -1044,8 +1336,17 @@ 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 + + if ventoy_vcfg_proc "${vt_chosen_path}"; then + return + fi + + vtoyboot_common_func "${vtoy_iso_part}${vt_chosen_path}" } function vtoy_unsupport_menuentry { @@ -1060,8 +1361,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 "${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 @@ -1086,8 +1387,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 "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver" + vt_trailer_cpio ${vtoy_iso_part} "${vt_chosen_path}" noinit ventoy_debug_pause @@ -1104,8 +1405,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 "${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 @@ -1126,8 +1427,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 "${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 @@ -1147,8 +1448,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 "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver" + vt_trailer_cpio ${vtoy_iso_part} "${vt_chosen_path}" noinit ventoy_debug_pause @@ -1169,8 +1470,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 "${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 @@ -1193,8 +1494,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 "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver" + vt_trailer_cpio ${vtoy_iso_part} "${vt_chosen_path}" noinit ventoy_debug_pause @@ -1210,8 +1511,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 "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver" + vt_trailer_cpio ${vtoy_iso_part} "${vt_chosen_path}" noinit ventoy_debug_pause @@ -1226,6 +1527,68 @@ function ventoy_img_batocera { vt_unset_boot_opt } +function ventoy_img_openwrt { + if [ -e (vtimghd,2)/lib64 ]; then + set ventoy_busybox_ver=64 + fi + + if [ ! -f ${vtoy_iso_part}/ventoy/ventoy_openwrt.xz ]; then + ventoy_gui_console + echo -e "\n ventoy_openwrt.xz not found. Please refer https://www.ventoy.net/en/doc_openwrt.html.\n" + echo -e " 未找到 ventoy_openwrt.xz 文件。请参考 https://www.ventoy.net/cn/doc_openwrt.html\n" + echo -e "\n press ENTER to exit (请按 回车 键返回) ..." + read vtInputKey + ventoy_cli_console + return + fi + + if vt_img_check_range "${vtoy_iso_part}${vt_chosen_path}"; then + ventoy_debug_pause + else + ventoy_gui_console + echo -e "\n IMG file need processed. Please refer https://www.ventoy.net/en/doc_openwrt.html.\n" + echo -e " 此 IMG 文件必须处理之后才能支持。请参考 https://www.ventoy.net/cn/doc_openwrt.html\n" + echo -e "\n press ENTER to exit (请按 回车 键返回) ..." + read vtInputKey + ventoy_cli_console + return + fi + + + vt_load_cpio $vtoy_path "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver" + vt_trailer_cpio ${vtoy_iso_part} "${vt_chosen_path}" noinit + + vt_img_extra_initrd_append ${vtoy_iso_part}/ventoy/ventoy_openwrt.xz + + + #boot image file + vt_set_boot_opt rdinit=/vtoy/vtoy ventoyos=openwrt + vt_img_hook_root + + set root=(vtimghd,1) + configfile (vtimghd,1)/boot/grub/grub.cfg + + vt_img_unhook_root + vt_unset_boot_opt +} + +function ventoy_img_tails { + vt_load_cpio $vtoy_path "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver" + vt_trailer_cpio ${vtoy_iso_part} "${vt_chosen_path}" noinit + + ventoy_debug_pause + + #boot image file + vt_set_boot_opt rdinit=/vtoy/vtoy live-media=/dev/dm-1 ventoyos=tails + vt_img_hook_root + + set root=(vtimghd,1) + configfile (vtimghd,1)/efi/debian/grub.cfg + + vt_img_unhook_root + vt_unset_boot_opt +} + function ventoy_img_memtest86 { chainloader (vtimghd,1)/efi/boot/BOOTX64.efi boot @@ -1243,24 +1606,35 @@ 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 ventoy_vcfg_proc "${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) set vtback_root=$root ventoy_cli_console vt_push_last_entry + set vtback_theme=$theme + unset theme vt_img_extra_initrd_reset + vt_get_fs_label (vtimghd,1) vtImgHd1Label - if [ -d (vtimghd,2)/lib ]; then + if [ -d (vtimghd,2)/lib ]; then vt_get_fs_label (vtimghd,2) vtImgHd2Label fi @@ -1268,24 +1642,29 @@ function img_common_menuentry { vt_1st_line (vtimghd,1)/etc/hostname vtImgHostname fi + if [ -e (vtimghd,1)/easy.sfs ]; then 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 vt_str_begin "$vtImgHd1Label" "Tails"; then + ventoy_img_tails elif [ "$vtImgHd2Label" = "RECALBOX" ]; then ventoy_img_recalbox elif [ -f (vtimghd,2)/loader/entries/ubos.conf ]; then ventoy_img_ubos + elif [ -f (vtimghd,2)/etc/openwrt_version ]; then + ventoy_img_openwrt elif [ -f (vtimghd,1)/efi/boot/mt86.png ]; then if [ "$grub_platform" = "pc" ]; then img_unsupport_tip @@ -1293,18 +1672,20 @@ 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 set root=$vtback_root vt_pop_last_entry + set theme=$vtback_theme ventoy_gui_console set ventoy_compatible=NO } @@ -1321,7 +1702,10 @@ function img_unsupport_menuentry { ############################################################# ############################################################# -set VENTOY_VERSION="1.0.21" +set VENTOY_VERSION="1.0.41" + +#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 @@ -1330,6 +1714,7 @@ set VTOY_DEFAULT_MENU_MODE=0 set VTOY_MEM_DISK_STR="[Memdisk]" set VTOY_ISO_RAW_STR="Compatible Mode" +set VTOY_GRUB2_MODE_STR="GRUB2 Mode" set VTOY_ISO_UEFI_DRV_STR="UEFI FS" set VTOY_F2_CMD="ventoy_power" @@ -1339,8 +1724,20 @@ 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" + elif [ "$grub_cpu" = "mips64el" ]; then + set VTOY_EFI_ARCH=mips + set VTOY_TEXT_MENU_VER="Ventoy $VENTOY_VERSION MIPS 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 @@ -1358,7 +1755,7 @@ if [ "$vtoy_dev" = "tftp" ]; then 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 @@ -1382,7 +1779,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 @@ -1417,7 +1816,7 @@ 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 @@ -1445,17 +1844,73 @@ else terminal_output gfxterm fi +if [ -n "$VTOY_DEFAULT_KBD_LAYOUT" ]; then + set_keyboard_layout "$VTOY_DEFAULT_KBD_LAYOUT" +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 + +for vtTFile in ventoy.json ventoy_grub.cfg; do + if [ -f $vtoy_efi_part/ventoy/$vtTFile ]; then + clear + echo -e "\n You need to put $vtTFile in the 1st partition which hold the ISO files.\n" + echo -e " $vtTFile 放错分区了，请放到镜像分区里的 ventoy 目录下（此目录需要手动创建）！\n" + echo -e "\n press ENTER to continue (请按 回车 键继续) ..." + read vtInputKey + fi +done + +#clear all input key before show main menu +vt_clear_key + #export necessary variable export theme export gfxmode +export gfxpayload export vtoydev export vtoy_path export vtdebug_flag +export vtoy_iso_fs 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