1.0.90 release

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

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index 71750eef5537dfcd584691cf8b6386acaa3fb24c..6400c92258a6d247ce0cd36da9fb99574dfdea86 100644 (file)
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -16,6 +16,11 @@
 # 
 #************************************************************************************
 
 # 
 #************************************************************************************
 

+if [ "$grub_platform" = "pc" ]; then
+    insmod setkey
+    insmod regexp
+fi
+

 function ventoy_pause {
     echo "press Enter to continue ......"
     read vtTmpPause
 function ventoy_pause {
     echo "press Enter to continue ......"
     read vtTmpPause


@@ -85,7 +90,7 @@ function ventoy_ext_menu {
         unset ventoy_new_context
     else
        echo "ventoy_grub.cfg NOT exist."
         unset ventoy_new_context
     else
        echo "ventoy_grub.cfg NOT exist."

-       echo -e "\npress ENTER to exit ..."
+       echo -en "\n$VTLANG_ENTER_EXIT ..."

        read vtInputKey
     fi
 }
        read vtInputKey
     fi
 }


@@ -114,13 +119,14 @@ function ventoy_show_help {
 }
 
 function ventoy_load_menu_lang_file {
 }
 
 function ventoy_load_menu_lang_file {

-    vt_load_file_to_mem "auto" $vtoy_efi_part/grub/menu.tar.gz vtoy_menu_lang_mem
+    vt_load_file_to_mem "auto" $prefix/menu.tar.gz vtoy_menu_lang_mem

     loopback vt_menu_tarfs mem:${vtoy_menu_lang_mem_addr}:size:${vtoy_menu_lang_mem_size}    
 }
 
 function get_os_type {
     set vtoy_os=Linux
     loopback vt_menu_tarfs mem:${vtoy_menu_lang_mem_addr}:size:${vtoy_menu_lang_mem_size}    
 }
 
 function get_os_type {
     set vtoy_os=Linux

-    
+    export vtoy_os
+

     if vt_str_begin "$vt_volume_id" "DLC Boot"; then
         if [ -f (loop)/DLCBoot.exe ]; then
             set vtoy_os=Windows
     if vt_str_begin "$vt_volume_id" "DLC Boot"; then
         if [ -f (loop)/DLCBoot.exe ]; then
             set vtoy_os=Windows


@@ -221,6 +227,8 @@ function distro_specify_wim_patch {
 function distro_specify_wim_patch_phase2 {
     if [ -f (loop)/boot/boot.wim ]; then
         vt_windows_collect_wim_patch wim /boot/boot.wim
 function distro_specify_wim_patch_phase2 {
     if [ -f (loop)/boot/boot.wim ]; then
         vt_windows_collect_wim_patch wim /boot/boot.wim

+    elif [ -f (loop)/sources/boot.wim ]; then
+        vt_windows_collect_wim_patch wim /sources/boot.wim

     fi
 
     if vt_str_begin "$vt_volume_id" "DLC Boot"; then
     fi
 
     if vt_str_begin "$vt_volume_id" "DLC Boot"; then


@@ -393,6 +401,8 @@ function distro_specify_initrd_file_phase2 {
         vt_linux_specify_initrd_file /boot/full.cz
     elif [ -f (loop)/images/pxeboot/initrd.img ]; then
         vt_linux_specify_initrd_file /images/pxeboot/initrd.img
         vt_linux_specify_initrd_file /boot/full.cz
     elif [ -f (loop)/images/pxeboot/initrd.img ]; then
         vt_linux_specify_initrd_file /images/pxeboot/initrd.img

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

 
     fi
 }
 
     fi
 }


@@ -846,6 +856,16 @@ function uefi_linux_menu_func {
                 configfile "mem:${vt_sys_menu_mem_addr}:size:${vt_sys_menu_mem_size}"
             fi
         fi
                 configfile "mem:${vt_sys_menu_mem_addr}:size:${vt_sys_menu_mem_size}"
             fi
         fi

+        
+        if [ $vtback_cfg_find -eq 0 ]; then
+            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

 
         if [ "$vtback_cfg_find" = "0" ]; then
             echo " "
 
         if [ "$vtback_cfg_find" = "0" ]; then
             echo " "


@@ -891,11 +911,6 @@ function ventoy_reset_nojoliet {
 }
 
 function uefi_iso_menu_func {
 }
 
 function uefi_iso_menu_func {

-
-    if [ -d (loop)/ ]; then
-        loopback -d loop
-    fi
-

     if [ -n "$vtisouefi" ]; then
         set LoadIsoEfiDriver=on
         unset vtisouefi
     if [ -n "$vtisouefi" ]; then
         set LoadIsoEfiDriver=on
         unset vtisouefi


@@ -909,21 +924,13 @@ function uefi_iso_menu_func {
     vt_select_auto_install "${chosen_path}"
     vt_select_persistence "${chosen_path}"
 
     vt_select_auto_install "${chosen_path}"
     vt_select_persistence "${chosen_path}"
 

-    if vt_is_udf "${1}${chosen_path}"; then
-        set ventoy_fs_probe=udf
-    else
-        set ventoy_fs_probe=iso9660
-        ventoy_reset_nojoliet
-
+    if ! vt_is_udf "${1}${chosen_path}"; then

         # Lenovo EasyStartup need an addional sector for boundary check
         if vt_str_begin "$vt_volume_id" "EasyStartup"; then
             vt_skip_svd "${vtoy_iso_part}${vt_chosen_path}"
             vt_append_extra_sector 1
         fi
     fi
         # Lenovo EasyStartup need an addional sector for boundary check
         if vt_str_begin "$vt_volume_id" "EasyStartup"; then
             vt_skip_svd "${vtoy_iso_part}${vt_chosen_path}"
             vt_append_extra_sector 1
         fi
     fi

-
-    loopback loop "${1}${chosen_path}"
-    get_os_type (loop)

     
     if [ -d (loop)/EFI ]; then
         set vt_efi_dir=YES
     
     if [ -d (loop)/EFI ]; then
         set vt_efi_dir=YES


@@ -942,15 +949,6 @@ function uefi_iso_menu_func {
         vt_check_compatible (loop)        
     fi
     
         vt_check_compatible (loop)        
     fi
     

-    if vt_need_secondary_menu "$vt_chosen_name"; then
-        vt_show_secondary_menu "$vt_chosen_path" "$vtoy_os" $vt_chosen_size
-        if vt_check_mode 0 "$vt_chosen_name"; then
-            uefi_iso_memdisk $vtoy_iso_part  "$vt_chosen_path"
-            vt_secondary_recover_mode
-            return
-        fi
-    fi
-    

     vt_img_sector "${1}${chosen_path}"
     
     if [ "$ventoy_fs_probe" = "iso9660" ]; then
     vt_img_sector "${1}${chosen_path}"
     
     if [ "$ventoy_fs_probe" = "iso9660" ]; then


@@ -967,8 +965,7 @@ function uefi_iso_menu_func {
         uefi_linux_menu_func  "$1" "${chosen_path}"
     fi
 
         uefi_linux_menu_func  "$1" "${chosen_path}"
     fi
 

-    ventoy_gui_console
-    vt_secondary_recover_mode
+    ventoy_gui_console    

 }
 
 function uefi_iso_memdisk {    
 }
 
 function uefi_iso_memdisk {    


@@ -1313,6 +1310,16 @@ function legacy_linux_menu_func {
                     configfile "mem:${vt_sys_menu_mem_addr}:size:${vt_sys_menu_mem_size}"
                 fi
             fi
                     configfile "mem:${vt_sys_menu_mem_addr}:size:${vt_sys_menu_mem_size}"
                 fi
             fi

+            
+            if [ $vtback_cfg_find -eq 0 ]; then
+                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

 
             vt_unset_boot_opt
             set root=$vtback_root        
 
             vt_unset_boot_opt
             set root=$vtback_root        


@@ -1346,26 +1353,10 @@ function legacy_unix_menu_func {
 
 
 function legacy_iso_menu_func {
 
 
 function legacy_iso_menu_func {

-
-    if [ -d (loop)/ ]; then
-        loopback -d loop
-    fi
-

     set chosen_path="$2"
     
     vt_select_auto_install "${chosen_path}"
     vt_select_persistence "${chosen_path}"
     set chosen_path="$2"
     
     vt_select_auto_install "${chosen_path}"
     vt_select_persistence "${chosen_path}"

-
-    if vt_is_udf "${1}${chosen_path}"; then
-        set ventoy_fs_probe=udf
-    else
-        set ventoy_fs_probe=iso9660
-        ventoy_reset_nojoliet
-    fi
-    
-    loopback loop "${1}${chosen_path}"
-    
-    get_os_type (loop)

     
     if [ -n "$vtcompat" ]; then
         set ventoy_compatible=YES
     
     if [ -n "$vtcompat" ]; then
         set ventoy_compatible=YES


@@ -1376,15 +1367,6 @@ function legacy_iso_menu_func {
         vt_check_compatible (loop)
     fi
     
         vt_check_compatible (loop)
     fi
     

-    if vt_need_secondary_menu "$vt_chosen_name"; then
-        vt_show_secondary_menu "$vt_chosen_path" "$vtoy_os" $vt_chosen_size  
-        if vt_check_mode 0 "$vt_chosen_name"; then
-            legacy_iso_memdisk $vtoy_iso_part  "$vt_chosen_path"
-            vt_secondary_recover_mode
-            return
-        fi        
-    fi
-

     vt_img_sector "${1}${chosen_path}"
 
     if [ "$ventoy_fs_probe" = "iso9660" ]; then
     vt_img_sector "${1}${chosen_path}"
 
     if [ "$ventoy_fs_probe" = "iso9660" ]; then


@@ -1481,7 +1463,7 @@ function iso_common_menuentry {
             echo -e "\n $vt_volume_space $vt_chosen_size $vt_chosen_size_mod\n"
             echo -e "\n The size of the iso file \"$vt_chosen_size\" is invalid. File corrupted ?\n"
             echo -e " 此ISO文件的大小 \"$vt_chosen_size\" 有问题，请确认文件是否损坏。\n"
             echo -e "\n $vt_volume_space $vt_chosen_size $vt_chosen_size_mod\n"
             echo -e "\n The size of the iso file \"$vt_chosen_size\" is invalid. File corrupted ?\n"
             echo -e " 此ISO文件的大小 \"$vt_chosen_size\" 有问题，请确认文件是否损坏。\n"

-            echo -e "\n press ENTER to continue (请按 回车 键继续) ..."
+            echo -en "\n$VTLANG_ENTER_CONTINUE ..."

             read vtInputKey
         fi
     fi
             read vtInputKey
         fi
     fi


@@ -1493,6 +1475,33 @@ function iso_common_menuentry {
     if ventoy_vcfg_proc "${vt_chosen_path}"; then        
         return
     fi
     if ventoy_vcfg_proc "${vt_chosen_path}"; then        
         return
     fi

+    
+    
+    
+    #secondary boot menu
+    if vt_is_udf "${vtoy_iso_part}${vt_chosen_path}"; then
+        set ventoy_fs_probe=udf
+    else
+        set ventoy_fs_probe=iso9660
+        ventoy_reset_nojoliet
+    fi
+    
+    if [ -d (loop)/ ]; then
+        loopback -d loop
+    fi
+    loopback loop "${vtoy_iso_part}${vt_chosen_path}" 
+    
+    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
+            return
+        fi
+    fi
+

 
     if vt_str_begin "$vt_volume_id" "Avira"; then 
         vt_skip_svd "${vtoy_iso_part}${vt_chosen_path}"
 
     if vt_str_begin "$vt_volume_id" "Avira"; then 
         vt_skip_svd "${vtoy_iso_part}${vt_chosen_path}"


@@ -1544,7 +1553,9 @@ function iso_common_menuentry {
         else
             uefi_iso_menu_func $vtoy_iso_part  "$vt_chosen_path"
         fi
         else
             uefi_iso_menu_func $vtoy_iso_part  "$vt_chosen_path"
         fi

-    fi      
+    fi
+
+    vt_secondary_recover_mode

 }
 
 function miso_common_menuentry {
 }
 
 function miso_common_menuentry {


@@ -1569,7 +1580,7 @@ function miso_common_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"    
 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 "\npress ENTER to exit (请按 回车 键返回) ..."    
+    echo -en "\n$VTLANG_ENTER_EXIT ..."  

     read vtInputKey
 }
 
     read vtInputKey
 }
 


@@ -1716,7 +1727,7 @@ function vhd_common_menuentry {
                 echo -e "!!! WARNING !!!\n"
                 echo -e "\nPartition1 ($vtoy_iso_fs) is NOT ntfs, the VHD(x) file may not boot normally \n"
                 echo -e "\nVHD(x) 文件所在分区不是 ntfs 格式, 可能无法正常启动 \n\n"
                 echo -e "!!! WARNING !!!\n"
                 echo -e "\nPartition1 ($vtoy_iso_fs) is NOT ntfs, the VHD(x) file may not boot normally \n"
                 echo -e "\nVHD(x) 文件所在分区不是 ntfs 格式, 可能无法正常启动 \n\n"

-                echo -n "press ENTER to continue boot (请按 回车 键继续) ..."    
+                echo -en "\n$VTLANG_ENTER_CONTINUE ..."

                 read vtInputKey
             fi
         fi
                 read vtInputKey
             fi
         fi


@@ -1825,7 +1836,7 @@ function vtoy_unsupport_menuentry {
 
 function only_uefi_tip {
     echo -e "\n This IMG file is only supported in UEFI mode. \n"
 
 function only_uefi_tip {
     echo -e "\n This IMG file is only supported in UEFI mode. \n"

-    echo -e "\n press ENTER to exit ..."
+    echo -en "\n$VTLANG_ENTER_EXIT ..."

     read vtInputKey 
 }
 
     read vtInputKey 
 }
 


@@ -1917,6 +1928,20 @@ function ventoy_img_openelec {
     loopback vtloopex $vtoy_efi_part/ventoy/vtloopex.cpio    
     vt_img_extra_initrd_append  (vtloopex)/$elec_ver/vtloopex.tar.xz
 
     loopback vtloopex $vtoy_efi_part/ventoy/vtloopex.cpio    
     vt_img_extra_initrd_append  (vtloopex)/$elec_ver/vtloopex.tar.xz
 

+    if [ "$elec_ver" = "LibreELEC" ]; then
+        if [ -f (vtimghd,1)/system ]; then
+            loopback elecsfs (vtimghd,1)/system
+            vt_get_lib_module_ver (elecsfs) /usr/lib/kernel-overlays/base/lib/modules/  vt_module_ver
+            if [ -n "$vt_module_ver" ]; then        
+                for mod in "kernel/drivers/md/dm-mod.ko"; do
+                    if [ -e (elecsfs)/usr/lib/kernel-overlays/base/lib/modules/$vt_module_ver/$mod ]; then
+                        vt_img_extra_initrd_append  (elecsfs)/usr/lib/kernel-overlays/base/lib/modules/$vt_module_ver/$mod
+                    fi
+                done
+            fi
+        fi
+    fi
+

     ventoy_debug_pause
 
     #boot image file
     ventoy_debug_pause
 
     #boot image file


@@ -1929,6 +1954,7 @@ function ventoy_img_openelec {
     vt_img_unhook_root
     vt_unset_boot_opt
     loopback -d vtloopex
     vt_img_unhook_root
     vt_unset_boot_opt
     loopback -d vtloopex

+    loopback -d elecsfs

 }
 
 
 }
 
 


@@ -2083,7 +2109,7 @@ function ventoy_img_openwrt {
             ventoy_gui_console
             echo -e "\n ventoy_openwrt.xz not found. Please refer https://www.ventoy.net/en/doc_openwrt.html.\n"
             echo -e " 未找到 ventoy_openwrt.xz 文件。请参考 https://www.ventoy.net/cn/doc_openwrt.html\n"
             ventoy_gui_console
             echo -e "\n ventoy_openwrt.xz not found. Please refer https://www.ventoy.net/en/doc_openwrt.html.\n"
             echo -e " 未找到 ventoy_openwrt.xz 文件。请参考 https://www.ventoy.net/cn/doc_openwrt.html\n"

-            echo -e "\n press ENTER to exit (请按 回车 键返回) ..."
+            echo -en "\n$VTLANG_ENTER_EXIT ..."

             read vtInputKey
             ventoy_cli_console
             return
             read vtInputKey
             ventoy_cli_console
             return


@@ -2207,6 +2233,23 @@ function ventoy_img_cloudready {
     unset linuxpartB
 }
 
     unset linuxpartB
 }
 

+
+function ventoy_img_fwts {
+    vt_load_cpio  $vtoy_path  "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver"
+    vt_trailer_cpio ${vtoy_iso_part} "${vt_chosen_path}" noinit
+
+    ventoy_debug_pause
+
+    #boot image file
+    vt_set_boot_opt rdinit=/vtoy/vtoy ventoyos=fwts
+    vt_img_hook_root
+    
+    configfile $prefix/distro/fwts.cfg
+
+    vt_img_unhook_root
+    vt_unset_boot_opt
+}
+

 function ventoy_img_memtest86 {      
     chainloader (vtimghd,1)/efi/boot/BOOTX64.efi
     boot
 function ventoy_img_memtest86 {      
     chainloader (vtimghd,1)/efi/boot/BOOTX64.efi
     boot


@@ -2215,7 +2258,7 @@ function ventoy_img_memtest86 {
 function img_unsupport_tip {
     echo -e "\n This IMG file is NOT supported now. \n"
     echo -e " 当前不支持启动此 IMG 文件 \n"    
 function img_unsupport_tip {
     echo -e "\n This IMG file is NOT supported now. \n"
     echo -e " 当前不支持启动此 IMG 文件 \n"    

-    echo -e "\npress ENTER to exit (请按 回车 键返回) ..."    
+    echo -en "\n$VTLANG_ENTER_EXIT ..."

     read vtInputKey 
 }
 
     read vtInputKey 
 }
 


@@ -2272,6 +2315,12 @@ function img_common_menuentry {
         vt_get_fs_label (vtimghd,2) vtImgHd2Label
     fi
 
         vt_get_fs_label (vtimghd,2) vtImgHd2Label
     fi
 

+    if [ -z "$vtImgHd1Label" ]; then
+        if [ -d (vtimghd,2)/efi ]; then
+            vt_get_fs_label (vtimghd,3) vtImgHd3Label
+        fi
+    fi
+

     if [ -e (vtimghd,1)/etc/hostname ]; then
         vt_1st_line (vtimghd,1)/etc/hostname vtImgHostname
     fi
     if [ -e (vtimghd,1)/etc/hostname ]; then
         vt_1st_line (vtimghd,1)/etc/hostname vtImgHostname
     fi


@@ -2289,6 +2338,8 @@ function img_common_menuentry {
         elif [ -f (vtimghd,3)/etc/chrome_dev.conf ]; then
             ventoy_img_cloudready
         fi
         elif [ -f (vtimghd,3)/etc/chrome_dev.conf ]; then
             ventoy_img_cloudready
         fi

+    elif vt_str_begin "$vtImgHd3Label" "fwts-result"; then
+        ventoy_img_fwts

     elif vt_str_begin "$vtImgHd1Label" "LAKKA"; then
         ventoy_img_openelec lakka
     elif vt_str_begin "$vtImgHd1Label" "LIBREELEC"; then
     elif vt_str_begin "$vtImgHd1Label" "LAKKA"; then
         ventoy_img_openelec lakka
     elif vt_str_begin "$vtImgHd1Label" "LIBREELEC"; then


@@ -2314,14 +2365,15 @@ function img_common_menuentry {
     elif [ -f (vtimghd,2)/loader/entries/ubos.conf ]; then
         ventoy_img_ubos
     elif [ -f (vtimghd,2)/etc/openwrt_version ]; then
     elif [ -f (vtimghd,2)/loader/entries/ubos.conf ]; then
         ventoy_img_ubos
     elif [ -f (vtimghd,2)/etc/openwrt_version ]; then

-        ventoy_img_openwrt
-    elif [ -f (vtimghd,1)/efi/boot/mt86.png ]; then 
-        if [ "$grub_platform" = "pc" ]; then
-            img_unsupport_tip
-        else
-            ventoy_img_memtest86            
-        fi    
+        ventoy_img_openwrt    

     else
     else

+        if [ -f (vtimghd,1)/efi/boot/mt86.png ]; then 
+            if [ "$grub_platform" = "pc" ]; then
+                img_unsupport_tip
+            fi 
+        fi
+
+        #common chain

         vt_linux_chain_data "${vtoy_iso_part}${vt_chosen_path}"
         ventoy_acpi_param ${vtoy_chain_mem_addr} 512
         if [ "$grub_platform" = "pc" ]; then 
         vt_linux_chain_data "${vtoy_iso_part}${vt_chosen_path}"
         ventoy_acpi_param ${vtoy_chain_mem_addr} 512
         if [ "$grub_platform" = "pc" ]; then 


@@ -2346,6 +2398,28 @@ function img_unsupport_menuentry {
     common_unsupport_menuentry
 }
 
     common_unsupport_menuentry
 }
 

+function mimg_common_menuentry {
+    vt_chosen_img_path vt_chosen_path vt_chosen_size vt_chosen_name
+
+    if vt_check_password "${vt_chosen_path}"; then
+        return
+    fi
+
+    echo "memdisk mode boot for $vt_chosen_path"
+    echo ""
+    ventoy_debug_pause
+
+    if [ "$grub_platform" = "pc" ]; then
+        legacy_img_memdisk $vtoy_iso_part "$vt_chosen_path"
+    else
+        vt_load_img_memdisk "$vtoy_iso_part$vt_chosen_path" vtoy_img_buf
+        ventoy_cli_console
+        chainloader ${vtoy_path}/ventoy_${VTOY_EFI_ARCH}.efi memdisk env_param=${env_param} isoefi=${LoadIsoEfiDriver} ${vtdebug_flag} mem:${vtoy_img_buf_addr}:size:${vtoy_img_buf_size}
+        boot
+        ventoy_gui_console    
+    fi      
+}
+

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


@@ -2354,7 +2428,7 @@ function img_unsupport_menuentry {
 #############################################################
 #############################################################
 
 #############################################################
 #############################################################
 

-set VENTOY_VERSION="1.0.83"
+set VENTOY_VERSION="1.0.90"

 
 #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


@@ -2457,9 +2531,9 @@ else
 fi
 
 if [ -n "$VTOY_MENU_LANGUAGE" ]; then
 fi
 
 if [ -n "$VTOY_MENU_LANGUAGE" ]; then

-    vt_load_menu_lang "$VTOY_MENU_LANGUAGE"
+    vt_init_menu_lang "$VTOY_MENU_LANGUAGE"

 else
 else

-    vt_load_menu_lang en_US
+    vt_init_menu_lang en_US

 fi
 
 if [ -n "$VTOY_MENU_TIMEOUT" ]; then
 fi
 
 if [ -n "$VTOY_MENU_TIMEOUT" ]; then


@@ -2512,7 +2586,20 @@ elif [ "$vtoy_display_mode" = "serial_console" ]; then
     fi
     terminal_input   serial console
     terminal_output  serial console    
     fi
     terminal_input   serial console
     terminal_output  serial console    

-else    
+else
+    if [ "$vtoy_gfxmode" = "max" ]; then
+        set gfxmode=1024x768
+        terminal_output  gfxterm
+
+        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
     else
     if [ -n "$vtoy_theme" ]; then
         vt_set_theme
     else