X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/93996cf7e2b4c1a762131c02344b24c1bc89400a..8b975b5e809b7dc4f5518d6ecb22296c1bb378bd:/INSTALL/grub/grub.cfg diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg index d62b71d..284cce0 100644 --- a/INSTALL/grub/grub.cfg +++ b/INSTALL/grub/grub.cfg @@ -130,9 +130,7 @@ function get_os_type { function vt_check_compatible_pe { #Check for PE without external tools - if [ -f "$1/HBCD_PE.ini" ]; then - set ventoy_compatible=YES - fi + return } function locate_initrd { @@ -161,7 +159,7 @@ function distro_specify_wim_patch { vt_windows_collect_wim_patch wim /BOOT/H3_7PE.WIM vt_windows_collect_wim_patch wim /BOOT/H3_8PE.WIM vt_windows_collect_wim_patch wim /BOOT/H3_81PE.WIM - fi + fi } function distro_specify_wim_patch_phase2 { @@ -550,6 +548,22 @@ function uefi_windows_menu_func { fi } +function uefi_find_replace_initrd { + if vt_get_efi_vdisk_offset "${1}${2}" vt_efivdisk_offset; then + loopback -s $vt_efivdisk_offset vtefivdisk "${1}${2}" + + unset vt_rp_initrd + vt_search_replace_initrd (vtefivdisk) vt_rp_initrd + + if [ -n "$vt_rp_initrd" ]; then + vt_add_replace_file $3 "$vt_rp_initrd" + fi + + loopback -d vtefivdisk + ventoy_debug_pause + fi +} + function uefi_linux_menu_func { if [ "$ventoy_compatible" = "NO" ]; then @@ -631,6 +645,11 @@ function uefi_linux_menu_func { elif [ -f (loop)/loader/entries/pisi-efi-x86_64.conf ]; then vt_add_replace_file $vtindex "EFI\\pisi\\initrd.img" fi + + vt_get_replace_file_cnt vt_replace_cnt + if [ $vt_replace_cnt -eq 0 ]; then + uefi_find_replace_initrd "$1" "$2" $vtindex + 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" @@ -638,6 +657,8 @@ function uefi_linux_menu_func { vt_add_replace_file 0 "EFI\\hyperiso\\hyperiso.img" fi elif [ -d (loop)/EFI/BOOT/entries ]; then + vt_linux_get_main_initrd_index vtindex + 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 @@ -848,13 +869,14 @@ function vtoy_windows_wimboot_func { linux16 "$vtoy_path/$vt_wimkernel" quiet ventoy_debug_pause - echo Loading files...... (This may take a few minutes, please wait) + vt_set_wim_load_prompt 1 "Loading files......" initrd16 newc:vtoyjump.exe:$vtoy_path/vtoyjump${vtoy_wimboot_bit}.exe \ newc:wimboot.data:mem:${vtoy_wimboot_mem_addr}:size:${vtoy_wimboot_mem_size} \ newc:winpeshl.ini:mem:${vtoy_winpeshl_ini_addr}:size:${vtoy_winpeshl_ini_size} \ newc:bcd:$vtoy_wimboot_prefix/boot/bcd \ newc:boot.sdi:$vtoy_wimboot_prefix/boot/boot.sdi \ newc:boot.wim:$vtoy_wimboot_prefix/sources/boot.wim + vt_set_wim_load_prompt 0 boot else if [ "$grub_cpu" = "i386" ]; then @@ -863,8 +885,10 @@ function vtoy_windows_wimboot_func { set vt_wimkernel=wimboot.x86_64.xz fi - echo Loading files...... (This may take a few minutes, please wait) + vt_set_wim_load_prompt 1 "Loading files......" vt_load_file_to_mem "nodecompress" $vtoy_wimboot_prefix/sources/boot.wim vtoy_wimfile_mem + vt_set_wim_load_prompt 0 + if [ $? -eq 0 ]; then set vtoy_wimfile_path=mem:${vtoy_wimfile_mem_addr}:size:${vtoy_wimfile_mem_size} else @@ -897,7 +921,7 @@ function legacy_windows_menu_func { loopback loop "$1$2" fi - for file in "boot/bcd" "/efi/microsoft/boot/bcd" "SSTR/BCD"; do + for file in "boot/bcd" "/efi/microsoft/boot/bcd" "SSTR/BCD" "boot/bce"; do vt_windows_collect_wim_patch bcd (loop)/$file done @@ -1396,7 +1420,7 @@ function vtoyboot_common_func { ventoy_pause fi fi - + vt_img_sector "${1}" vt_raw_chain_data "${1}" @@ -1623,14 +1647,25 @@ function ventoy_img_openwrt { 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 + vt_fs_enum_1st_dir (vtimghd,2) /lib/modules/ vt_dir_name + + if [ -f (vtimghd,2)/lib/modules/$vt_dir_name/dm-mod.ko ]; then + set openwrt_plugin_need=0 + vt_img_extra_initrd_append (vtimghd,2)/lib/modules/$vt_dir_name/dm-mod.ko + if [ -f (vtimghd,2)/lib/modules/$vt_dir_name/dax.ko ]; then + vt_img_extra_initrd_append (vtimghd,2)/lib/modules/$vt_dir_name/dax.ko + fi + else + set openwrt_plugin_need=1 + 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 fi if vt_img_check_range "${vtoy_iso_part}${vt_chosen_path}"; then @@ -1645,12 +1680,14 @@ function ventoy_img_openwrt { 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 - + if [ $openwrt_plugin_need -eq 1 ]; then + if [ -f ${vtoy_iso_part}/ventoy/ventoy_openwrt.xz ]; then + vt_img_extra_initrd_append ${vtoy_iso_part}/ventoy/ventoy_openwrt.xz + fi + fi #boot image file vt_set_boot_opt rdinit=/vtoy/vtoy ventoyos=openwrt @@ -1692,6 +1729,15 @@ function img_unsupport_tip { read vtInputKey } +function legacy_img_memdisk { + linux16 $vtoy_path/memdisk + echo "Loading img file to memory ..." + initrd16 "${1}${2}" + + ventoy_cli_console + boot +} + function img_common_menuentry { set ventoy_compatible=YES set ventoy_busybox_ver=32 @@ -1706,8 +1752,11 @@ function img_common_menuentry { return fi - if [ -d (vtimghd)/ ]; then - loopback -d vtimghd + if [ "$grub_platform" = "pc" ]; then + if vt_check_mode 0; then + legacy_img_memdisk $vtoy_iso_part "$vt_chosen_path" + return + fi fi loopback vtimghd "${vtoy_iso_part}${vt_chosen_path}" @@ -1774,6 +1823,8 @@ function img_common_menuentry { fi fi + loopback -d vtimghd + set root=$vtback_root vt_pop_last_entry set theme=$vtback_theme @@ -1793,7 +1844,7 @@ function img_unsupport_menuentry { ############################################################# ############################################################# -set VENTOY_VERSION="1.0.43" +set VENTOY_VERSION="1.0.49" #ACPI not compatible with Window7/8, so disable by default set VTOY_PARAM_NO_ACPI=1 @@ -1929,7 +1980,7 @@ elif [ "$vtoy_display_mode" = "serial_console" ]; then terminal_output serial console else if [ -n "$vtoy_theme" ]; then - set theme=$vtoy_theme + vt_set_theme else set theme=$prefix/themes/ventoy/theme.txt fi @@ -1974,6 +2025,12 @@ export vtoy_efi_part export VENTOY_VERSION export VTOY_CUR_VIDEO_MODE export VTOY_EFI_ARCH +export VTOY_MEM_DISK_STR +export VTOY_ISO_RAW_STR +export VTOY_GRUB2_MODE_STR +export VTOY_WIMBOOT_MODE_STR +export VTOY_ISO_UEFI_DRV_STR + #special VTOY_DEFAULT_IMAGE process if [ -n "$VTOY_DEFAULT_IMAGE" ]; then