X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/8c192a1807c3d69acea241b269febd608296a2bc..d8fbd79ddaad6791441f328731b9d3df4f1e654f:/INSTALL/grub/grub.cfg diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg index ac0ccde..82fdbbb 100644 --- a/INSTALL/grub/grub.cfg +++ b/INSTALL/grub/grub.cfg @@ -46,7 +46,7 @@ function ventoy_gui_console { function ventoy_acpi_param { if [ "$VTOY_PARAM_NO_ACPI" != "1" ]; then - vt_acpi_param $1 $2 + vt_acpi_param "$1" "$2" fi } @@ -283,7 +283,7 @@ function distro_specify_initrd_file_phase2 { function ventoy_get_ghostbsd_ver { - # vt_parse_iso_create_date $1/${chosen_path} vt_create_date + # 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 @@ -322,11 +322,11 @@ function ventoy_freebsd_proc { set vtFreeBsdDistro=FreeBSD 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" "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 @@ -338,7 +338,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 @@ -399,7 +399,7 @@ function ventoy_freebsd_proc { 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_unix_comm_proc { @@ -409,7 +409,7 @@ 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" = "NetBSD" ]; then echo "NetBSD not supported" @@ -422,7 +422,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 } @@ -435,7 +435,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 @@ -451,7 +451,7 @@ 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 @@ -472,10 +472,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}/ventoy.cpio "$2" "$1" "busybox=$ventoy_busybox_ver" vt_linux_clear_initrd @@ -561,7 +561,7 @@ function uefi_linux_menu_func { fi - vt_linux_chain_data ${1}${chosen_path} + vt_linux_chain_data "${1}${chosen_path}" if [ -n "$vtoy_chain_mem_addr" ]; then ventoy_acpi_param ${vtoy_chain_mem_addr} 2048 @@ -575,7 +575,7 @@ 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 @@ -603,18 +603,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 fi - loopback loop ${1}${chosen_path} + loopback loop "${1}${chosen_path}" get_os_type (loop) if [ -d (loop)/EFI ]; then @@ -634,19 +634,19 @@ function uefi_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} + 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 @@ -654,7 +654,7 @@ 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} @@ -672,7 +672,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 @@ -690,7 +690,7 @@ 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 @@ -709,10 +709,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/ventoy.cpio "$2" "$1" "busybox=$ventoy_busybox_ver" vt_linux_clear_initrd @@ -755,7 +755,7 @@ 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 @@ -770,7 +770,7 @@ 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 @@ -789,18 +789,19 @@ 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 fi - loopback loop ${1}${chosen_path} + loopback loop "${1}${chosen_path}" get_os_type (loop) @@ -813,19 +814,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} + 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 } @@ -833,7 +834,7 @@ function legacy_iso_memdisk { linux16 $vtoy_path/memdisk iso raw echo "Loading ISO file to memory ..." - initrd16 ${1}${2} + initrd16 "${1}${2}" boot } @@ -843,11 +844,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/ventoy.cpio "$2" "$1" "busybox=$ventoy_busybox_ver" + vt_trailer_cpio "$1" "$2" noinit ventoy_debug_pause @@ -873,7 +874,7 @@ function ventoy_iso_busybox_ver { #special process for deepin-live iso if [ "$vt_chosen_size" = "403701760" ]; then - if vt_str_str $vt_chosen_path "/deepin-live"; 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 @@ -889,28 +890,28 @@ function iso_common_menuentry { 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 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 + 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 } @@ -923,9 +924,9 @@ function miso_common_menuentry { 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 } @@ -947,7 +948,12 @@ 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_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 @@ -973,7 +979,7 @@ 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 + vt_concat_efi_iso "${vtoy_iso_part}${vt_chosen_path}" vtoy_iso_buf ventoy_debug_pause @@ -985,7 +991,7 @@ function efi_common_menuentry { 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 @@ -1009,7 +1015,7 @@ 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 @@ -1038,7 +1044,7 @@ function vtoyboot_common_func { set AltBootPart=0 set vtoysupport=0 - vt_get_vtoy_type ${1} vtoytype parttype AltBootPart + vt_get_vtoy_type "${1}" vtoytype parttype AltBootPart if vt_str_begin $vtoytype vhd; then set vtoysupport=1 @@ -1063,8 +1069,8 @@ function vtoyboot_common_func { fi fi - vt_img_sector ${1} - vt_raw_chain_data ${1} + vt_img_sector "${1}" + vt_raw_chain_data "${1}" ventoy_debug_pause @@ -1092,7 +1098,7 @@ 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} + vtoyboot_common_func "${vtoy_iso_part}${vt_chosen_path}" } function vtoy_unsupport_menuentry { @@ -1107,8 +1113,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/ventoy.cpio "${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 @@ -1133,8 +1139,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/ventoy.cpio "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver" + vt_trailer_cpio ${vtoy_iso_part} "${vt_chosen_path}" noinit ventoy_debug_pause @@ -1151,8 +1157,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/ventoy.cpio "${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 @@ -1173,8 +1179,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/ventoy.cpio "${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 @@ -1194,8 +1200,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/ventoy.cpio "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver" + vt_trailer_cpio ${vtoy_iso_part} "${vt_chosen_path}" noinit ventoy_debug_pause @@ -1216,8 +1222,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/ventoy.cpio "${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 @@ -1240,8 +1246,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/ventoy.cpio "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver" + vt_trailer_cpio ${vtoy_iso_part} "${vt_chosen_path}" noinit ventoy_debug_pause @@ -1257,8 +1263,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/ventoy.cpio "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver" + vt_trailer_cpio ${vtoy_iso_part} "${vt_chosen_path}" noinit ventoy_debug_pause @@ -1295,8 +1301,8 @@ function img_common_menuentry { 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) @@ -1340,7 +1346,7 @@ 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} @@ -1369,7 +1375,7 @@ function img_unsupport_menuentry { ############################################################# ############################################################# -set VENTOY_VERSION="1.0.28" +set VENTOY_VERSION="1.0.29" #ACPI not compatible with Window7/8, so disable by default set VTOY_PARAM_NO_ACPI=1