X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/d8fbd79ddaad6791441f328731b9d3df4f1e654f..17da2e2a21bb3eb37bfc2a3b0dbba12fdcd04a1d:/INSTALL/grub/grub.cfg diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg index 82fdbbb..15fe1e6 100644 --- a/INSTALL/grub/grub.cfg +++ b/INSTALL/grub/grub.cfg @@ -92,6 +92,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 @@ -106,13 +109,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 +203,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 +259,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 +273,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,7 +282,21 @@ 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 + 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 + fi } @@ -314,6 +333,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 } @@ -325,6 +359,8 @@ function ventoy_freebsd_proc { ventoy_get_ghostbsd_ver "$1" "${chosen_path}" elif vt_strstr "$vt_volume_id" "FREENAS"; then 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}" elif regexp "^13_[0-9]" "$vt_volume_id"; then @@ -387,7 +423,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 @@ -402,6 +438,22 @@ function ventoy_freebsd_proc { 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 { vt_unix_reset @@ -410,11 +462,12 @@ function ventoy_unix_comm_proc { if [ "$vt_unix_type" = "FreeBSD" ]; then 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" @@ -457,7 +510,7 @@ function uefi_windows_menu_func { 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" @@ -526,6 +579,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 @@ -563,10 +622,16 @@ function uefi_linux_menu_func { 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_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" @@ -580,7 +645,7 @@ function uefi_unix_menu_func { 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" @@ -657,7 +722,7 @@ function uefi_iso_memdisk { 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 @@ -731,6 +796,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 @@ -870,18 +937,25 @@ 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 + 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 } @@ -892,12 +966,20 @@ function iso_common_menuentry { 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 + 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 + 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 + elif vt_str_begin "$vt_volume_id" "TENS-Public"; then set vtcompat=1 fi @@ -919,6 +1001,10 @@ 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 @@ -948,6 +1034,11 @@ function iso_unsupport_menuentry { function wim_common_menuentry { vt_chosen_img_path vt_chosen_path vt_chosen_size + + 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 @@ -962,7 +1053,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 @@ -979,6 +1070,10 @@ function wim_unsupport_menuentry { function efi_common_menuentry { vt_chosen_img_path vt_chosen_path vt_chosen_size + 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 @@ -986,7 +1081,7 @@ function efi_common_menuentry { 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 @@ -1015,6 +1110,11 @@ function vhd_common_menuentry { fi vt_chosen_img_path vt_chosen_path vt_chosen_size + + if vt_check_password "${vt_chosen_path}"; then + return + fi + vt_patch_vhdboot "$vt_chosen_path" ventoy_debug_pause @@ -1026,7 +1126,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 @@ -1080,9 +1180,9 @@ function vtoyboot_common_func { 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 + vt_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 @@ -1097,7 +1197,12 @@ function vtoyboot_common_func { } function vtoy_common_menuentry { - vt_chosen_img_path vt_chosen_path vt_chosen_size + vt_chosen_img_path vt_chosen_path vt_chosen_size + + if vt_check_password "${vt_chosen_path}"; then + return + fi + vtoyboot_common_func "${vtoy_iso_part}${vt_chosen_path}" } @@ -1296,6 +1401,10 @@ 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 @@ -1325,15 +1434,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 @@ -1352,7 +1461,7 @@ function img_common_menuentry { 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 @@ -1375,7 +1484,7 @@ function img_unsupport_menuentry { ############################################################# ############################################################# -set VENTOY_VERSION="1.0.29" +set VENTOY_VERSION="1.0.33" #ACPI not compatible with Window7/8, so disable by default set VTOY_PARAM_NO_ACPI=1 @@ -1396,8 +1505,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 @@ -1439,7 +1557,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 @@ -1511,6 +1631,17 @@ if [ -n "$VTOY_PLUGIN_SYNTAX_ERROR" ]; then 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 + + #export necessary variable export theme export gfxmode @@ -1522,6 +1653,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