Fix a bug when booting nitrux-release-amd64_2021.05.28.iso (#953)

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

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index d62b71df239da21fd320518bbd90fa9009243fbe..8f231a2390f511109991475ffd260811cf380ae2 100644 (file)
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -848,13 +848,14 @@ function vtoy_windows_wimboot_func {
         linux16  "$vtoy_path/$vt_wimkernel"  quiet
         ventoy_debug_pause
 
         linux16  "$vtoy_path/$vt_wimkernel"  quiet
         ventoy_debug_pause
 

-        echo Loading files...... (This may take a few minutes, please wait)
+        vt_set_wim_load_prompt 1 "Loading files......"

         initrd16 newc:vtoyjump.exe:$vtoy_path/vtoyjump${vtoy_wimboot_bit}.exe \
              newc:wimboot.data:mem:${vtoy_wimboot_mem_addr}:size:${vtoy_wimboot_mem_size} \
              newc:winpeshl.ini:mem:${vtoy_winpeshl_ini_addr}:size:${vtoy_winpeshl_ini_size} \
              newc:bcd:$vtoy_wimboot_prefix/boot/bcd \
              newc:boot.sdi:$vtoy_wimboot_prefix/boot/boot.sdi \
              newc:boot.wim:$vtoy_wimboot_prefix/sources/boot.wim
         initrd16 newc:vtoyjump.exe:$vtoy_path/vtoyjump${vtoy_wimboot_bit}.exe \
              newc:wimboot.data:mem:${vtoy_wimboot_mem_addr}:size:${vtoy_wimboot_mem_size} \
              newc:winpeshl.ini:mem:${vtoy_winpeshl_ini_addr}:size:${vtoy_winpeshl_ini_size} \
              newc:bcd:$vtoy_wimboot_prefix/boot/bcd \
              newc:boot.sdi:$vtoy_wimboot_prefix/boot/boot.sdi \
              newc:boot.wim:$vtoy_wimboot_prefix/sources/boot.wim

+        vt_set_wim_load_prompt 0

         boot
     else
         if [ "$grub_cpu" = "i386" ]; then
         boot
     else
         if [ "$grub_cpu" = "i386" ]; then


@@ -863,8 +864,10 @@ function vtoy_windows_wimboot_func {
             set vt_wimkernel=wimboot.x86_64.xz
         fi
 
             set vt_wimkernel=wimboot.x86_64.xz
         fi
 

-        echo Loading files...... (This may take a few minutes, please wait)
+        vt_set_wim_load_prompt 1 "Loading files......"

         vt_load_file_to_mem "nodecompress" $vtoy_wimboot_prefix/sources/boot.wim vtoy_wimfile_mem
         vt_load_file_to_mem "nodecompress" $vtoy_wimboot_prefix/sources/boot.wim vtoy_wimfile_mem

+        vt_set_wim_load_prompt 0
+

         if [ $? -eq 0 ]; then
             set vtoy_wimfile_path=mem:${vtoy_wimfile_mem_addr}:size:${vtoy_wimfile_mem_size}
         else
         if [ $? -eq 0 ]; then
             set vtoy_wimfile_path=mem:${vtoy_wimfile_mem_addr}:size:${vtoy_wimfile_mem_size}
         else


@@ -1793,7 +1796,7 @@ function img_unsupport_menuentry {
 #############################################################
 #############################################################
 
 #############################################################
 #############################################################
 

-set VENTOY_VERSION="1.0.43"
+set VENTOY_VERSION="1.0.45"

 
 #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


@@ -1929,7 +1932,7 @@ elif [ "$vtoy_display_mode" = "serial_console" ]; then
     terminal_output  serial console    
 else    
     if [ -n "$vtoy_theme" ]; then
     terminal_output  serial console    
 else    
     if [ -n "$vtoy_theme" ]; then

-        set theme=$vtoy_theme
+        vt_set_theme

     else
         set theme=$prefix/themes/ventoy/theme.txt
     fi
     else
         set theme=$prefix/themes/ventoy/theme.txt
     fi