Fix VTOY_WIN11_BYPASS_CHECK/VTOY_WIN11_BYPASS_NRO option web page display issue.

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

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index fe130668fffa8dfbb05ec6cee6b0b924812777d2..f055d88847659ee75c8204cae04904f6698b10dd 100644 (file)
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -19,7 +19,6 @@
 if [ "$grub_platform" = "pc" ]; then
     insmod setkey
     insmod regexp
-    insmod video_fb
 fi
 
 function ventoy_pause {
@@ -860,6 +859,9 @@ function uefi_linux_menu_func {
             if [ -f (loop)/boot/isolinux/syslnx64.cfg ]; then
                 syslinux_configfile (loop)/boot/isolinux/syslnx64.cfg
                 set vtback_cfg_find=1
+            elif [ -f (loop)/boot/syslinux/porteus.cfg ]; then
+                syslinux_configfile (loop)/boot/syslinux/porteus.cfg
+                set vtback_cfg_find=1
             fi
         fi
 
@@ -1311,6 +1313,9 @@ function legacy_linux_menu_func {
                 if [ -f (loop)/boot/isolinux/syslnx64.cfg ]; then
                     syslinux_configfile (loop)/boot/isolinux/syslnx64.cfg
                     set vtback_cfg_find=1
+                elif [ -f (loop)/boot/syslinux/porteus.cfg ]; then
+                    syslinux_configfile (loop)/boot/syslinux/porteus.cfg
+                    set vtback_cfg_find=1
                 fi
             fi
 
@@ -1486,6 +1491,8 @@ function iso_common_menuentry {
     
     get_os_type (loop)
     
+    ventoy_debug_pause
+    
     if vt_need_secondary_menu "$vt_chosen_name"; then
         vt_show_secondary_menu "$vt_chosen_path" "$vtoy_os" $vt_chosen_size
         if [ "$VTOY_SECOND_EXIT" = "1" ]; then
@@ -2379,7 +2386,7 @@ function mimg_common_menuentry {
 #############################################################
 #############################################################
 
-set VENTOY_VERSION="1.0.86"
+set VENTOY_VERSION="1.0.87"
 
 #ACPI not compatible with Window7/8, so disable by default
 set VTOY_PARAM_NO_ACPI=1
@@ -2538,9 +2545,18 @@ elif [ "$vtoy_display_mode" = "serial_console" ]; then
     terminal_input   serial console
     terminal_output  serial console    
 else
-    if [ "$vtoy_res_fit" = "1" ]; then
+    if [ "$vtoy_gfxmode" = "max" ]; then
+        set gfxmode=1024x768
         terminal_output  gfxterm
-    fi
+
+        vt_enum_video_mode
+        vt_get_video_mode 0 vtCurMode
+        terminal_output console
+        set gfxmode=$vtCurMode
+        terminal_output gfxterm
+    elif [ "$vtoy_res_fit" = "1" ]; then
+        terminal_output  gfxterm
+    fi    
 
     if [ -n "$vtoy_theme" ]; then
         vt_set_theme