X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/e46e24dde7f000c4f824807c773d07c42ecec114..0c310c5bd84c5a4022a9dcfed475d36133db347a:/INSTALL/grub/grub.cfg diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg index 5d7d5b5..487dae0 100644 --- a/INSTALL/grub/grub.cfg +++ b/INSTALL/grub/grub.cfg @@ -158,7 +158,7 @@ function get_os_type { function vt_check_compatible_pe { #Check for PE without external tools #set compatible if ISO file is less than 80MB - if [ $vt_chosen_size -gt 33554432 -a $vt_chosen_size -le 83886080 ]; then + if [ $vt_chosen_size -GT 33554432 -a $vt_chosen_size -LE 83886080 ]; then set ventoy_compatible=YES fi @@ -381,7 +381,9 @@ function distro_specify_initrd_file_phase2 { vt_linux_specify_initrd_file /sysresccd/boot/i686/sysresccd.img elif [ -f (loop)/boot/full.cz ]; then vt_linux_specify_initrd_file /boot/full.cz - + elif [ -f (loop)/images/pxeboot/initrd.img ]; then + vt_linux_specify_initrd_file /images/pxeboot/initrd.img + fi } @@ -768,7 +770,7 @@ function uefi_linux_menu_func { vt_linux_chain_data "${1}${chosen_path}" - if [ -n "$LoadIsoEfiDriver" -a $vt_chosen_size -lt 104857600 ]; then + if [ -n "$LoadIsoEfiDriver" -a $vt_chosen_size -LT 104857600 ]; then if [ -f (loop)/efi/clover/cloverx64.efi ]; then unset LoadIsoEfiDriver fi @@ -1307,7 +1309,7 @@ function iso_common_menuentry { vt_chosen_img_path vt_chosen_path vt_chosen_size vt_chosen_name 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 + if [ $vt_volume_space -NE $vt_chosen_size ]; then vt_mod $vt_chosen_size 2048 vt_chosen_size_mod if [ $vt_chosen_size_mod -ne 0 ]; then echo -e "\n $vt_volume_space $vt_chosen_size $vt_chosen_size_mod\n" @@ -1355,7 +1357,7 @@ function iso_common_menuentry { fi #For iKuai8 (<64MB) - if [ $vt_chosen_size -le 67108864 ]; then + if [ $vt_chosen_size -LE 67108864 ]; then if vt_str_begin "$vt_chosen_name" "iKuai"; then set vtMemDiskBoot=1 fi @@ -1797,7 +1799,7 @@ function ventoy_img_ubos { } function ventoy_img_recalbox { - if [ $vtoy_img_max_part_end -gt $vt_chosen_size ]; then + if [ $vtoy_img_max_part_end -GT $vt_chosen_size ]; then echo -e "\nPlease extend the img file size before boot it. \n" ventoy_pause return @@ -2076,11 +2078,15 @@ function img_common_menuentry { if vt_str_begin "$vtImgHd3Label" "ROOT-"; then if [ -f (vtimghd,3)/etc/os-release.d/ID ]; then vt_1st_line (vtimghd,3)/etc/os-release.d/ID vt_release_line1 - if [ vt_str_begin "$vt_release_line1" "FydeOS" ]; then + if vt_str_begin "$vt_release_line1" "FydeOS"; then ventoy_img_fydeos + else + ventoy_img_cloudready fi elif [ -f (vtimghd,3)/etc/cloudready-release ]; then ventoy_img_cloudready + elif [ -f (vtimghd,3)/etc/chrome_dev.conf ]; then + ventoy_img_cloudready fi elif vt_str_begin "$vtImgHd1Label" "LAKKA"; then ventoy_img_openelec lakka @@ -2145,7 +2151,7 @@ function img_unsupport_menuentry { ############################################################# ############################################################# -set VENTOY_VERSION="1.0.78" +set VENTOY_VERSION="1.0.79" #ACPI not compatible with Window7/8, so disable by default set VTOY_PARAM_NO_ACPI=1