X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/dce5d1b769ff2c404d61d8a60510de624b275337..f82475d950109b9328ce5ccfdd9949fed4a96306:/INSTALL/grub/grub.cfg diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg index 08504fb..d5bd465 100644 --- a/INSTALL/grub/grub.cfg +++ b/INSTALL/grub/grub.cfg @@ -311,18 +311,15 @@ function distro_specify_initrd_file_phase2 { 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 { @@ -369,6 +366,7 @@ function ventoy_get_midnightbsd_ver { 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}" @@ -419,8 +417,6 @@ 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 set vt_freebsd_bit=64 @@ -431,7 +427,17 @@ 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" @@ -646,10 +652,14 @@ function uefi_linux_menu_func { if [ -n "$vtoy_chain_mem_addr" ]; then ventoy_acpi_param ${vtoy_chain_mem_addr} 2048 ventoy_cli_console - - 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 + + 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 @@ -885,9 +895,39 @@ function legacy_linux_menu_func { 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 + 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 @@ -1030,7 +1070,7 @@ function iso_common_menuentry { 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_volume_space -gt $vt_chosen_size -o $vt_chosen_size_mod -ne 0 ]; then + 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" @@ -1606,7 +1646,7 @@ function img_unsupport_menuentry { ############################################################# ############################################################# -set VENTOY_VERSION="1.0.37" +set VENTOY_VERSION="1.0.40" #ACPI not compatible with Window7/8, so disable by default set VTOY_PARAM_NO_ACPI=1 @@ -1618,6 +1658,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" @@ -1747,6 +1788,9 @@ 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 @@ -1766,6 +1810,8 @@ for vtTFile in ventoy.json ventoy_grub.cfg; do fi done +#clear all input key before show main menu +vt_clear_key #export necessary variable export theme @@ -1774,6 +1820,7 @@ 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