1.0.27 release

[Ventoy.git] / INSTALL / grub / grub.cfg

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index a263996a964f05237291abdebe13a96fbc973253..bafba8d034ca2d02f85307f73da4bd0c2291ea27 100644 (file)
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -265,6 +265,12 @@ function distro_specify_initrd_file_phase2 {
         fi
     elif [ -f (loop)/blackarch/boot/x86_64/archiso.img ]; then 
         vt_linux_specify_initrd_file /blackarch/boot/x86_64/archiso.img
         fi
     elif [ -f (loop)/blackarch/boot/x86_64/archiso.img ]; then 
         vt_linux_specify_initrd_file /blackarch/boot/x86_64/archiso.img

+        
+    elif [ -f (loop)/install.amd/initrd.gz ]; then
+        vt_linux_specify_initrd_file /live/initrd2.img
+        vt_linux_specify_initrd_file /install.amd/initrd.gz
+        vt_linux_specify_initrd_file /install.amd/gtk/initrd.gz
+        

     fi
 }
 
     fi
 }
 


@@ -619,6 +625,10 @@ function uefi_iso_menu_func {
     
     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}
+    fi
+    

     if [ "$vtoy_os" = "Windows" ]; then
         vt_check_compatible_pe (loop)        
         uefi_windows_menu_func  $1 ${chosen_path}
     if [ "$vtoy_os" = "Windows" ]; then
         vt_check_compatible_pe (loop)        
         uefi_windows_menu_func  $1 ${chosen_path}


@@ -782,7 +792,7 @@ function legacy_iso_menu_func {
     loopback loop ${1}${chosen_path}
     
     get_os_type (loop)
     loopback loop ${1}${chosen_path}
     
     get_os_type (loop)

-
+    

     if [ -n "$vtcompat" ]; then
         set ventoy_compatible=YES
         unset vtcompat
     if [ -n "$vtcompat" ]; then
         set ventoy_compatible=YES
         unset vtcompat


@@ -794,6 +804,10 @@ function legacy_iso_menu_func {
     
     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}
+    fi
+

     if [ "$vtoy_os" = "Windows" ]; then
         vt_check_compatible_pe (loop)        
         legacy_windows_menu_func  $1 ${chosen_path}
     if [ "$vtoy_os" = "Windows" ]; then
         vt_check_compatible_pe (loop)        
         legacy_windows_menu_func  $1 ${chosen_path}


@@ -1344,7 +1358,7 @@ function img_unsupport_menuentry {
 #############################################################
 #############################################################
 
 #############################################################
 #############################################################
 

-set VENTOY_VERSION="1.0.25"
+set VENTOY_VERSION="1.0.27"

 
 #ACPI not compatible with Window7/8, so disable by default
 set VTOY_PARAM_NO_ACPI=1
 
 #ACPI not compatible with Window7/8, so disable by default
 set VTOY_PARAM_NO_ACPI=1


@@ -1384,7 +1398,7 @@ if [ "$vtoy_dev" = "tftp" ]; then
     loadfont ascii
 
     if [ -f $vtoy_iso_part/ventoy/ventoy.json ]; then
     loadfont ascii
 
     if [ -f $vtoy_iso_part/ventoy/ventoy.json ]; then

-       set vt_plugin_path=$vtoy_iso_part
+        set vt_plugin_path=$vtoy_iso_part

     else
         set vt_plugin_path=$prefix
         vt_load_plugin $vt_plugin_path
     else
         set vt_plugin_path=$prefix
         vt_load_plugin $vt_plugin_path


@@ -1471,6 +1485,15 @@ else
     terminal_output  gfxterm
 fi
 
     terminal_output  gfxterm
 fi
 

+
+if [ -n "$VTOY_PLUGIN_SYNTAX_ERROR" ]; then
+    clear
+    echo -e "\n Syntax error detected in ventoy.json, please check! \n"
+    echo -e " ventoy.json 文件中有语法错误，所有配置都不会生效，请检查！\n"
+    echo -e "\n press ENTER to continue (请按 回车 键继续) ..."
+    read vtInputKey 
+fi
+

 #export necessary variable
 export theme
 export gfxmode
 #export necessary variable
 export theme
 export gfxmode