X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/1cbe4c81b4978311696ab4e9e8dffb7d98b82570..e384dad4d05a796baa5534231b2cae80d8c4062a:/INSTALL/grub/grub.cfg

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index 144b78e..6b94d74 100644
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -30,6 +30,29 @@ function ventoy_debug_pause {
     fi
 }
 
+function ventoy_cli_console {      
+    if [ "$grub_platform" = "pc" ]; then
+        terminal_output  vga_text
+    else
+        if [ "$vtoy_display_mode" != "CLI" ]; then
+            terminal_output  console
+        fi
+    fi
+}
+
+function ventoy_gui_console {  
+    if [ "$grub_platform" = "pc" ]; then
+        if [ "$vtoy_display_mode" = "CLI" ]; then
+            terminal_output  console
+        else
+            terminal_output  gfxterm
+        fi
+    else
+        if [ "$vtoy_display_mode" != "CLI" ]; then
+            terminal_output  gfxterm
+        fi
+    fi
+}
 
 function ventoy_power {
     configfile $prefix/power.cfg
@@ -186,7 +209,7 @@ function uefi_windows_menu_func {
     ventoy_debug_pause
     
     if [ -n "$vtoy_chain_mem_addr" ]; then
-        terminal_output  console       
+        ventoy_cli_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}
         boot
     else
@@ -262,7 +285,7 @@ function uefi_linux_menu_func {
     vt_linux_chain_data ${1}${chosen_path}
 
     if [ -n "$vtoy_chain_mem_addr" ]; then
-        terminal_output  console       
+        ventoy_cli_console       
         chainloader ${vtoy_path}/ventoy_x64.efi  env_param=${env_param} isoefi=${LoadIsoEfiDriver} FirstTry=${FirstTryBootFile} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
         boot
     else
@@ -327,7 +350,7 @@ function uefi_iso_menu_func {
         uefi_linux_menu_func  $1 ${chosen_path}
     fi
 
-    terminal_output  gfxterm    
+    ventoy_gui_console
 }
 
 function uefi_iso_memdisk {    
@@ -336,11 +359,11 @@ function uefi_iso_memdisk {
     echo 'Loading ISO file to memory ...'
     vt_load_iso_to_mem ${1}${chosen_path} vtoy_iso_buf
     
-    terminal_output  console
+    ventoy_cli_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
+    ventoy_gui_console
 }
 
 
@@ -527,9 +550,9 @@ function wim_common_menuentry {
         if [ "$grub_platform" = "pc" ]; then
             linux16   $vtoy_path/ipxe.krn ${vtdebug_flag}  mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
         else
-            terminal_output  console       
+            ventoy_cli_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
+            ventoy_gui_console
         fi
         boot
     else
@@ -545,10 +568,10 @@ function wim_unsupport_menuentry {
 function efi_common_menuentry {
     vt_chosen_img_path chosen_path
     
-    terminal_output  console    
+    ventoy_cli_console    
     chainloader ${iso_path}${chosen_path}
     boot
-    terminal_output  gfxterm
+    ventoy_gui_console
 }
 
 function efi_unsupport_menuentry {
@@ -650,15 +673,14 @@ else
     set gfxmode=1920x1080,1366x768,1024x768
 fi
 
-if [ -n "$vtoy_theme" ]; then
-    set theme=$vtoy_theme
-else
-    set theme=$prefix/themes/ventoy/theme.txt
-fi
-
 if [ "$vtoy_display_mode" = "CLI" ]; then
     terminal_output  console
-else
+else    
+    if [ -n "$vtoy_theme" ]; then
+        set theme=$vtoy_theme
+    else
+        set theme=$prefix/themes/ventoy/theme.txt
+    fi
     terminal_output  gfxterm
 fi