X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/9eb334d99a1d2890fa7b17cf47250e94689d39ee..ce6d379564344879d8c441fa01a2c622ee85adb8:/INSTALL/grub/grub.cfg diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg index a7a0cae..a263996 100644 --- a/INSTALL/grub/grub.cfg +++ b/INSTALL/grub/grub.cfg @@ -44,6 +44,12 @@ function ventoy_gui_console { fi } +function ventoy_acpi_param { + if [ "$VTOY_PARAM_NO_ACPI" != "1" ]; then + vt_acpi_param $1 $2 + fi +} + function ventoy_power { configfile $prefix/power.cfg } @@ -252,7 +258,13 @@ function distro_specify_initrd_file_phase2 { if [ "$grub_platform" != "pc" ]; then vt_add_replace_file 0 "minimal\\x86_64\\rootfs.xz" fi - + elif [ -f (loop)/arch/boot/x86_64/archiso.img ]; then + vt_linux_specify_initrd_file /arch/boot/x86_64/archiso.img + if [ "$grub_platform" != "pc" ]; then + vt_add_replace_file 0 "EFI\\archiso\\archiso.img" + fi + elif [ -f (loop)/blackarch/boot/x86_64/archiso.img ]; then + vt_linux_specify_initrd_file /blackarch/boot/x86_64/archiso.img fi } @@ -430,6 +442,7 @@ function uefi_windows_menu_func { 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} boot @@ -440,6 +453,7 @@ function uefi_windows_menu_func { } function uefi_linux_menu_func { + if [ "$ventoy_compatible" = "NO" ]; then if [ "$ventoy_fs_probe" = "udf" ]; then @@ -472,6 +486,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 @@ -490,9 +505,19 @@ function uefi_linux_menu_func { if [ -d (loop)/arch ]; then if [ -f (loop)/arch/boot/x86_64/archiso.img ]; then vt_add_replace_file $vtindex "EFI\\archiso\\archiso.img" + elif [ -f (loop)/arch/boot/x86_64/initramfs-linux.img ]; then + vt_add_replace_file $vtindex "arch\\boot\\x86_64\\initramfs-linux.img" elif [ -f (loop)/boot/initramfs_x86_64.img ]; then vt_add_replace_file $vtindex "boot\\initramfs_x86_64.img" fi + elif [ -d (loop)/blackarch ]; then + if [ -f (loop)/blackarch/boot/x86_64/archiso.img ]; then + vt_add_replace_file $vtindex "EFI\\archiso\\archiso.img" + fi + elif [ -d (loop)/parabola ]; then + if [ -f (loop)/parabola/boot/x86_64/parabolaiso.img ]; then + vt_add_replace_file $vtindex "EFI\\parabolaiso\\parabolaiso.img" + fi elif [ -f (loop)/EFI/BOOT/initrd.gz ]; then vt_add_replace_file $vtindex "EFI\\BOOT\\initrd.gz" elif [ -f (loop)/loader/entries/thinstation.conf ]; then @@ -508,7 +533,7 @@ function uefi_linux_menu_func { fi elif [ -d (loop)/EFI/BOOT/entries ]; then if [ -f (loop)/parabola/boot/x86_64/parabolaiso.img ]; then - vt_add_replace_file 0 "EFI\\parabolaiso\\parabolaiso.img" + vt_add_replace_file 0 "EFI\\parabolaiso\\parabolaiso.img" fi elif [ -e (loop)/syslinux/alt0/full.cz ]; then vt_add_replace_file 0 "EFI\\BOOT\\full.cz" @@ -522,6 +547,7 @@ function uefi_linux_menu_func { 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} boot @@ -535,6 +561,7 @@ function uefi_unix_menu_func { 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} boot @@ -587,7 +614,7 @@ 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} @@ -646,9 +673,8 @@ function legacy_windows_menu_func { ventoy_debug_pause if [ -n "$vtoy_chain_mem_addr" ]; then - linux16 $vtoy_path/ipxe.krn ${vtdebug_flag} ibft mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size} - set gfxmode=1920x1080,1366x768,1024x768,800x600,auto - terminal_output gfxterm + ventoy_acpi_param ${vtoy_chain_mem_addr} 2048 + linux16 $vtoy_path/ipxe.krn ${vtdebug_flag} ibft mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size} boot else echo "chain empty failed" @@ -712,6 +738,7 @@ 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 else @@ -725,6 +752,7 @@ function legacy_unix_menu_func { 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 @@ -900,9 +928,7 @@ function wim_common_menuentry { if [ -n "$vtoy_chain_mem_addr" ]; then if [ "$grub_platform" = "pc" ]; then - linux16 $vtoy_path/ipxe.krn ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size} - set gfxmode=1920x1080,1366x768,1024x768,800x600,auto - terminal_output gfxterm + linux16 $vtoy_path/ipxe.krn ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size} else ventoy_cli_console chainloader ${vtoy_path}/ventoy_x64.efi env_param=${env_param} isoefi=${LoadIsoEfiDriver} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size} @@ -945,7 +971,6 @@ function efi_unsupport_menuentry { common_unsupport_menuentry } - function vhd_common_menuentry { if [ "$VTOY_VHD_NO_WARNING" != "1" ]; then @@ -959,17 +984,14 @@ function vhd_common_menuentry { fi vt_chosen_img_path vt_chosen_path vt_chosen_size - vt_patch_vhdboot ${vt_chosen_path} + vt_patch_vhdboot $vt_chosen_path ventoy_debug_pause if [ -n "$vtoy_vhd_buf_addr" ]; then if [ "$grub_platform" = "pc" ]; then linux16 $vtoy_path/memdisk iso raw - initrd16 mem:${vtoy_vhd_buf_addr}:size:${vtoy_vhd_buf_size} - - set gfxmode=1920x1080,1366x768,1024x768,800x600,auto - terminal_output gfxterm + initrd16 mem:${vtoy_vhd_buf_addr}:size:${vtoy_vhd_buf_size} boot else ventoy_cli_console @@ -978,7 +1000,7 @@ function vhd_common_menuentry { ventoy_gui_console fi else - echo "Failed to boot vhd file" + echo "Please put the right ventoy_vhdboot.img file to the 1st partition" ventoy_pause fi } @@ -987,6 +1009,71 @@ function vhd_unsupport_menuentry { common_unsupport_menuentry } +function vtoyboot_common_func { + set AltBootPart=0 + set vtoysupport=0 + + vt_get_vtoy_type ${1} vtoytype parttype AltBootPart + + if vt_str_begin $vtoytype vhd; then + set vtoysupport=1 + elif [ "$vtoytype" = "raw" ]; then + set vtoysupport=1 + elif [ "$vtoytype" = "vdi" ]; then + set vtoysupport=1 + fi + + if [ $vtoysupport -eq 1 ]; then + if [ "$grub_platform" = "pc" ]; then + if [ "$parttype" = "gpt" -a $AltBootPart -eq 0 ]; then + echo "The OS in the vdisk was created in UEFI mode, but current is Legacy BIOS mode." + echo "虚拟磁盘内的系统是在UEFI模式下创建的，而当前系统是Legacy BIOS模式，可能无法正常启动。" + ventoy_pause + fi + else + if [ "$parttype" = "mbr" -a $AltBootPart -eq 0 ]; then + echo "The OS in the vdisk was created in Legacy BIOS mode, but current is UEFI mode." + echo "虚拟磁盘内的系统是在Legacy BIOS模式下创建的，而当前系统是UEFI模式，可能无法正常启动。" + ventoy_pause + fi + fi + + vt_img_sector ${1} + vt_raw_chain_data ${1} + + ventoy_debug_pause + + if [ -n "$vtoy_chain_mem_addr" ]; then + if [ "$grub_platform" = "pc" ]; then + vt_acpi_param ${vtoy_chain_mem_addr} 512 + linux16 $vtoy_path/ipxe.krn ${vtdebug_flag} bios80 sector512 mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size} + boot + else + ventoy_acpi_param ${vtoy_chain_mem_addr} 512 + ventoy_cli_console + chainloader ${vtoy_path}/ventoy_x64.efi sector512 env_param=${ventoy_env_param} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size} + boot + ventoy_gui_console + fi + else + echo "chain empty failed!" + ventoy_pause + fi + else + echo "Unsupported vtoy type $vtoytype" + ventoy_pause + fi +} + +function vtoy_common_menuentry { + vt_chosen_img_path vt_chosen_path vt_chosen_size + vtoyboot_common_func ${vtoy_iso_part}${vt_chosen_path} +} + +function vtoy_unsupport_menuentry { + common_unsupport_menuentry +} + # #============================================================# # IMG file boot process # @@ -1228,10 +1315,12 @@ function img_common_menuentry { ventoy_img_memtest86 fi else + vt_linux_chain_data ${vtoy_iso_part}${vt_chosen_path} + ventoy_acpi_param ${vtoy_chain_mem_addr} 512 if [ "$grub_platform" = "pc" ]; then - img_unsupport_tip - else - vt_linux_chain_data ${vtoy_iso_part}${vt_chosen_path} + 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} boot fi @@ -1255,7 +1344,10 @@ function img_unsupport_menuentry { ############################################################# ############################################################# -set VENTOY_VERSION="1.0.21" +set VENTOY_VERSION="1.0.25" + +#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 @@ -1351,10 +1443,11 @@ if [ -n "$vtoy_gfxmode" ]; then set gfxmode=$vtoy_gfxmode set gfxpayload=keep else - set gfxmode=1920x1080,1366x768,1024x768,800x600,auto + set gfxmode=1024x768 set gfxpayload=keep fi + if [ "$vtoy_display_mode" = "CLI" ]; then terminal_output console elif [ "$vtoy_display_mode" = "serial" ]; then @@ -1381,15 +1474,16 @@ fi #export necessary variable export theme export gfxmode +export gfxpayload export vtoydev +export vtoy_path +export vtdebug_flag export vtoy_iso_part export vtoy_efi_part export VENTOY_VERSION export VTOY_CUR_VIDEO_MODE - - #colect all image files (iso files) set ventoy_img_count=0 vt_list_img $vtoy_iso_part ventoy_img_count