1.0.14 release

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

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index e7627f651155f55a37eee481058fdd3a8d3b5a96..144b78e109f86a09c2d021ac3c79aa15ff5500e5 100644 (file)
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -152,7 +152,9 @@ function distro_specify_initrd_file_phase2 {
         vt_linux_specify_initrd_file /live/initrd.img
     elif [ -f (loop)/initrd.img ]; then 
         vt_linux_specify_initrd_file /initrd.img
-
+    elif [ -f (loop)/sysresccd/boot/x86_64/sysresccd.img ]; then 
+        vt_linux_specify_initrd_file /sysresccd/boot/x86_64/sysresccd.img
+    
     fi
 }
 
@@ -337,6 +339,8 @@ function uefi_iso_memdisk {
     terminal_output  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}
     boot
+    
+    terminal_output  gfxterm
 }
 
 
@@ -502,12 +506,16 @@ function iso_common_menuentry {
     fi      
 }
 
-function iso_unsupport_menuentry {
+function common_unsupport_menuentry {
     echo -e "\n The name of the iso file could NOT contain space or non-ascii characters. \n"
+    echo -e " 文件名中不能有中文或空格 \n"
     echo -e "\n Will return to main menu after 10 seconds ...\n"
     sleep 10
 }
 
+function iso_unsupport_menuentry {
+    common_unsupport_menuentry
+}
 
 function wim_common_menuentry {
     vt_chosen_img_path chosen_path
@@ -521,6 +529,7 @@ function wim_common_menuentry {
         else
             terminal_output  console       
             chainloader ${vtoy_path}/ventoy_x64.efi  env_param=${env_param} isoefi=${LoadIsoEfiDriver} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
+            terminal_output  gfxterm
         fi
         boot
     else
@@ -530,9 +539,20 @@ function wim_common_menuentry {
 }
 
 function wim_unsupport_menuentry {
-    echo -e "\n The name of the wim file could NOT contain space or non-ascii characters. \n"
-    echo -e "\n Will return to main menu after 10 seconds ...\n"
-    sleep 10
+    common_unsupport_menuentry
+}
+
+function efi_common_menuentry {
+    vt_chosen_img_path chosen_path
+    
+    terminal_output  console    
+    chainloader ${iso_path}${chosen_path}
+    boot
+    terminal_output  gfxterm
+}
+
+function efi_unsupport_menuentry {
+    common_unsupport_menuentry
 }
 
 #############################################################
@@ -543,16 +563,13 @@ function wim_unsupport_menuentry {
 #############################################################
 #############################################################
 
-set VENTOY_VERSION="1.0.13"
+set VENTOY_VERSION="1.0.14"
 
 # Default menu display mode, you can change it as you want.
 #    0: List mode   
 #    1: TreeView mode
 set VTOY_DEFAULT_MENU_MODE=0
 
-#disable timeout
-unset timeout
-
 set VTOY_MEM_DISK_STR="[Memdisk]"
 set VTOY_ISO_RAW_STR="Compatible Mode"
 set VTOY_ISO_UEFI_DRV_STR="UEFI FS"
@@ -579,6 +596,13 @@ if [ "$vtoy_dev" = "tftp" ]; then
         fi
     done
     loadfont ascii
+
+    if [ -f $iso_path/ventoy/ventoy.json ]; then
+       set vt_plugin_path=$iso_path
+    else
+        set vt_plugin_path=$prefix
+        vt_load_plugin $vt_plugin_path
+    fi
 else
     if [ "$prefix" = "(ventoydisk)/grub" ]; then
         set vtoy_path=(ventoydisk)/ventoy
@@ -589,6 +613,7 @@ else
     set iso_path=($vtoy_dev,1)
     set vtoy_efi_part=($vtoy_dev,2)
     loadfont unicode
+    set vt_plugin_path=$iso_path
 fi
 
 
@@ -597,6 +622,12 @@ if [ -f $iso_path/ventoy/ventoy.json ]; then
    vt_load_plugin $iso_path
 fi
 
+if [ -n "$VTOY_MENU_TIMEOUT" ]; then
+    set timeout=$VTOY_MENU_TIMEOUT
+else
+    unset timeout
+fi
+
 if [ -f $iso_path/ventoy/ventoy_wimboot.img ]; then
     vt_load_wimboot $iso_path/ventoy/ventoy_wimboot.img
 elif [ -f $vtoy_efi_part/ventoy/ventoy_wimboot.img ]; then
@@ -631,8 +662,6 @@ else
     terminal_output  gfxterm
 fi
 
-#vtdebug on
-
 #colect all image files (iso files)
 set ventoy_img_count=0
 vt_list_img $iso_path ventoy_img_count