Update ko_KR.json (#2177)

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

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index 0534cabef620e162b5aee7715eb50270494017f8..a55dd41826aa795165b173853698b19e703c0cb9 100644 (file)
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -119,7 +119,7 @@ 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}    
 }
 
     loopback vt_menu_tarfs mem:${vtoy_menu_lang_mem_addr}:size:${vtoy_menu_lang_mem_size}    
 }
 


@@ -2216,6 +2216,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


@@ -2281,6 +2298,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


@@ -2298,6 +2321,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


@@ -2386,7 +2411,7 @@ function mimg_common_menuentry {
 #############################################################
 #############################################################
 
 #############################################################
 #############################################################
 

-set VENTOY_VERSION="1.0.86"
+set VENTOY_VERSION="1.0.88"

 
 #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


@@ -2545,9 +2570,18 @@ elif [ "$vtoy_display_mode" = "serial_console" ]; then
     terminal_input   serial console
     terminal_output  serial console    
 else
     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
         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
 
     if [ -n "$vtoy_theme" ]; then
         vt_set_theme