update

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

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index 144b78e109f86a09c2d021ac3c79aa15ff5500e5..c78473933a132acec0d857ca1a038e02d788f1a1 100644 (file)
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -30,6 +30,30 @@ function ventoy_debug_pause {
     fi
 }
 
     fi
 }
 

+function ventoy_cli_console {      
+    if [ "$grub_platform" = "pc" ]; then
+        #terminal_output  vga_text
+        terminal_output  console
+    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
 
 function ventoy_power {
     configfile $prefix/power.cfg


@@ -154,6 +178,8 @@ function distro_specify_initrd_file_phase2 {
         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
         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

+    elif [ -f (loop)/CDlinux/initrd ]; then 
+        vt_linux_specify_initrd_file /CDlinux/initrd

     
     fi
 }
     
     fi
 }


@@ -186,7 +212,7 @@ function uefi_windows_menu_func {
     ventoy_debug_pause
     
     if [ -n "$vtoy_chain_mem_addr" ]; then
     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
         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 +288,7 @@ function uefi_linux_menu_func {
     vt_linux_chain_data ${1}${chosen_path}
 
     if [ -n "$vtoy_chain_mem_addr" ]; then
     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
         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 +353,7 @@ function uefi_iso_menu_func {
         uefi_linux_menu_func  $1 ${chosen_path}
     fi
 
         uefi_linux_menu_func  $1 ${chosen_path}
     fi
 

-    terminal_output  gfxterm    
+    ventoy_gui_console

 }
 
 function uefi_iso_memdisk {    
 }
 
 function uefi_iso_memdisk {    


@@ -336,11 +362,11 @@ function uefi_iso_memdisk {
     echo 'Loading ISO file to memory ...'
     vt_load_iso_to_mem ${1}${chosen_path} vtoy_iso_buf
     
     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
     
     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 +553,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
         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}
             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
         fi
         boot
     else


@@ -545,16 +571,18 @@ function wim_unsupport_menuentry {
 function efi_common_menuentry {
     vt_chosen_img_path chosen_path
     
 function efi_common_menuentry {
     vt_chosen_img_path chosen_path
     

-    terminal_output  console    
+    ventoy_cli_console    

     chainloader ${iso_path}${chosen_path}
     boot
     chainloader ${iso_path}${chosen_path}
     boot

-    terminal_output  gfxterm
+    ventoy_gui_console

 }
 
 function efi_unsupport_menuentry {
     common_unsupport_menuentry
 }
 
 }
 
 function efi_unsupport_menuentry {
     common_unsupport_menuentry
 }
 

+
+

 #############################################################
 #############################################################
 #############################################################
 #############################################################
 #############################################################
 #############################################################


@@ -563,7 +591,7 @@ function efi_unsupport_menuentry {
 #############################################################
 #############################################################
 
 #############################################################
 #############################################################
 

-set VENTOY_VERSION="1.0.14"
+set VENTOY_VERSION="1.0.15"

 
 # Default menu display mode, you can change it as you want.
 #    0: List mode   
 
 # Default menu display mode, you can change it as you want.
 #    0: List mode   


@@ -650,15 +678,14 @@ else
     set gfxmode=1920x1080,1366x768,1024x768
 fi
 
     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
 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
 
     terminal_output  gfxterm
 fi