X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/d71514f23ee85c40e76b4b7391eff6fda2eca36f..aa033e1fb6666f8d504ecd57b13bebef2ce2a6bd:/INSTALL/grub/grub.cfg

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index eb50e5c..f180475 100644
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -138,6 +138,14 @@ function vt_check_compatible_pe {
     return
 }
 
+function vt_check_compatible_linux {
+    if vt_str_begin "$vt_volume_id" "embootkit"; then
+        set ventoy_compatible=YES
+    fi
+
+    return
+}
+
 function locate_initrd {
     vt_linux_locate_initrd 
 
@@ -829,6 +837,7 @@ function uefi_iso_menu_func {
     elif [ "$vtoy_os" = "Unix" ]; then
         uefi_unix_menu_func "$1" "${chosen_path}"
     else
+        vt_check_compatible_linux (loop)
         uefi_linux_menu_func  "$1" "${chosen_path}"
     fi
 
@@ -1066,7 +1075,7 @@ function legacy_linux_menu_func {
             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}
+            linux16   $vtoy_path/ipxe.krn ${vtdebug_flag}  mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}            
             boot
         fi
     else
@@ -1133,6 +1142,7 @@ function legacy_iso_menu_func {
     elif [ "$vtoy_os" = "Unix" ]; then
         legacy_unix_menu_func "$1" "${chosen_path}"
     else
+        vt_check_compatible_linux (loop)
         legacy_linux_menu_func  "$1" "${chosen_path}"
     fi
 }
@@ -1215,9 +1225,8 @@ function iso_common_menuentry {
             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"
-            echo -e "\n press ENTER to exit (请按 回车 键返回) ..."
+            echo -e "\n press ENTER to continue (请按 回车 键继续) ..."
             read vtInputKey
-            return
         fi
     fi
     
@@ -1954,7 +1963,7 @@ function img_unsupport_menuentry {
 #############################################################
 #############################################################
 
-set VENTOY_VERSION="1.0.51"
+set VENTOY_VERSION="1.0.54"
 
 #ACPI not compatible with Window7/8, so disable by default
 set VTOY_PARAM_NO_ACPI=1
@@ -2023,7 +2032,10 @@ else
     set vtoydev=$vtoy_dev
     set vtoy_iso_part=($vtoy_dev,1)
     set vtoy_efi_part=($vtoy_dev,2)
-    loadfont unicode
+    
+    vt_load_file_to_mem "auto" $prefix/fonts/unicode.pf2 vtoy_font_mem
+    loadfont mem:${vtoy_font_mem_addr}:size:${vtoy_font_mem_size}
+
     set vt_plugin_path=$vtoy_iso_part
 fi