X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/580ad598f616f81fcf69d545874f10f0a7024be2..HEAD:/INSTALL/grub/localboot.cfg

diff --git a/INSTALL/grub/localboot.cfg b/INSTALL/grub/localboot.cfg
index 9366b68..e746f1a 100644
--- a/INSTALL/grub/localboot.cfg
+++ b/INSTALL/grub/localboot.cfg
@@ -1,6 +1,6 @@
 
 if [ "$grub_platform" = "pc" ]; then
-    menuentry 'Search and boot Windows' --class=boot_windows --class=F4boot {
+    menuentry "$VTLANG_LB_SBOOT_WINDOWS" --class=boot_windows --class=F4boot {
     
         set partid=3
         while [ $partid -le 128 ]; do
@@ -38,7 +38,7 @@ if [ "$grub_platform" = "pc" ]; then
         fi        
     }
     
-    menuentry 'Search and boot Grub4dos' --class=boot_g4d --class=F4boot {
+    menuentry "$VTLANG_LB_SBOOT_G4D" --class=boot_g4d --class=F4boot {
         if search -n -s -f /grldr; then
             ntldr /grldr
         else
@@ -46,19 +46,19 @@ if [ "$grub_platform" = "pc" ]; then
         fi        
     }
     
-    menuentry 'Boot the 1st local disk' --class=boot_disk --class=F4boot {
+    menuentry "$VTLANG_LB_SBOOT_HDD1" --class=boot_disk --class=F4boot {
         set root=(hd0,1)
         chainloader +1
         boot
     }
     
-    menuentry 'Boot the 2nd local disk' --class=boot_disk --class=F4boot {
+    menuentry "$VTLANG_LB_SBOOT_HDD2" --class=boot_disk --class=F4boot {
         set root=(hd1,1)
         chainloader +1
         boot
     }
     
-    menuentry 'Boot the 3rd local disk' --class=boot_disk --class=F4boot {
+    menuentry "$VTLANG_LB_SBOOT_HDD3" --class=boot_disk --class=F4boot {
         set root=(hd2,1)
         chainloader +1
         boot
@@ -66,7 +66,7 @@ if [ "$grub_platform" = "pc" ]; then
     
 else
 
-    menuentry 'Search and boot Windows' --class=boot_windows --class=F4boot {    
+    menuentry "$VTLANG_LB_SBOOT_WINDOWS" --class=boot_windows --class=F4boot {    
         
         set partid=3
         while [ $partid -le 128 ]; do
@@ -81,13 +81,18 @@ else
                     terminal_output  console
                     chainloader /efi/Microsoft/Boot/bootmgfw.efi
                     boot
+                elif [ -f ($vtoydev,$partid)/VTEFI/Microsoft/Boot/bootmgfw.efi ]; then
+                    set root=($vtoydev,$partid)
+                    terminal_output  console
+                    chainloader /VTEFI/Microsoft/Boot/bootmgfw.efi
+                    boot
                 fi
             else
                 break
             fi
             vt_incr partid 1
         done
-                
+
         if search -n -s -f /EFI/Microsoft/Boot/bootmgfw.efi; then
             terminal_output  console
             chainloader /EFI/Microsoft/Boot/bootmgfw.efi
@@ -102,20 +107,25 @@ else
     }
     
     if [ "$grub_cpu" = "i386" ]; then
-        menuentry 'Search and boot BOOTIA32.EFI' --class=boot_uefi --class=F4boot {
+        menuentry "$VTLANG_LB_SBOOT_IA32EFI" --class=boot_uefi --class=F4boot {
             set VTOY_SEARCH_NO_VTOYEFI=1
             if search -n -s -f /efi/boot/bootia32.efi; then
                 unset VTOY_SEARCH_NO_VTOYEFI
                 terminal_output  console
                 chainloader /efi/boot/bootia32.efi
                 boot
+            elif search -n -s -f /vtefi/boot/bootia32.efi; then
+                unset VTOY_SEARCH_NO_VTOYEFI
+                terminal_output  console
+                chainloader /vtefi/boot/bootia32.efi
+                boot
             else
                 unset VTOY_SEARCH_NO_VTOYEFI
                 echo "BOOTIA32.EFI NOT found ..."
             fi        
         }
         
-        menuentry 'Search and boot xorboot' --class=boot_xorboot --class=F4boot {
+        menuentry "$VTLANG_LB_SBOOT_XORBOOT" --class=boot_xorboot --class=F4boot {
             set VTOY_SEARCH_NO_VTOYEFI=1
             if search -n -s -f /efi/xorboot/xorboot32.xor; then
                 unset VTOY_SEARCH_NO_VTOYEFI
@@ -126,39 +136,58 @@ else
                     chainloader /efi/xorboot/xorboot.efi
                 fi
                 boot
+            elif search -n -s -f /vtefi/xorboot/xorboot32.xor; then
+                unset VTOY_SEARCH_NO_VTOYEFI
+                terminal_output  console
+                if [ -f /vtefi/xorboot/bootia32.efi ]; then
+                    chainloader /vtefi/xorboot/bootia32.efi
+                elif [ -f /vtefi/xorboot/xorboot.efi ]; then
+                    chainloader /vtefi/xorboot/xorboot.efi
+                fi
+                boot
             else
                 unset VTOY_SEARCH_NO_VTOYEFI
                 echo "xorboot NOT found ..."
             fi        
         }
     elif [ "$grub_cpu" = "arm64" ]; then
-        menuentry 'Search and boot BOOTAA64.EFI' --class=boot_uefi --class=F4boot {
+        menuentry "$VTLANG_LB_SBOOT_AA64EFI" --class=boot_uefi --class=F4boot {
             set VTOY_SEARCH_NO_VTOYEFI=1
             if search -n -s -f /efi/boot/bootaa64.efi; then
                 unset VTOY_SEARCH_NO_VTOYEFI
                 terminal_output  console
                 chainloader /efi/boot/bootaa64.efi
                 boot
+            elif search -n -s -f /vtefi/boot/bootaa64.efi; then
+                unset VTOY_SEARCH_NO_VTOYEFI
+                terminal_output  console
+                chainloader /vtefi/boot/bootaa64.efi
+                boot
             else
                 unset VTOY_SEARCH_NO_VTOYEFI
                 echo "BOOTAA64.EFI NOT found ..."
             fi        
         }
     else
-        menuentry 'Search and boot BOOTX64.EFI' --class=boot_uefi --class=F4boot {
+        menuentry "$VTLANG_LB_SBOOT_X64EFI" --class=boot_uefi --class=F4boot {
             set VTOY_SEARCH_NO_VTOYEFI=1
             if search -n -s -f /efi/boot/bootx64.efi; then
                 unset VTOY_SEARCH_NO_VTOYEFI
                 terminal_output  console
                 chainloader /efi/boot/bootx64.efi
                 boot
+            elif search -n -s -f /vtefi/boot/bootx64.efi; then
+                unset VTOY_SEARCH_NO_VTOYEFI
+                terminal_output  console
+                chainloader /vtefi/boot/bootx64.efi
+                boot
             else
                 unset VTOY_SEARCH_NO_VTOYEFI
                 echo "BOOTX64.EFI NOT found ..."
             fi        
         }
 
-        menuentry 'Search and boot xorboot' --class=boot_xorboot --class=F4boot {
+        menuentry "$VTLANG_LB_SBOOT_XORBOOT" --class=boot_xorboot --class=F4boot {
             set VTOY_SEARCH_NO_VTOYEFI=1
             if search -n -s -f /efi/xorboot/xorboot.xor; then
                 unset VTOY_SEARCH_NO_VTOYEFI
@@ -169,6 +198,15 @@ else
                     chainloader /efi/xorboot/xorboot.efi
                 fi
                 boot
+            elif search -n -s -f /vtefi/xorboot/xorboot.xor; then
+                unset VTOY_SEARCH_NO_VTOYEFI
+                terminal_output  console
+                if [ -f /vtefi/xorboot/bootx64.efi ]; then
+                    chainloader /vtefi/xorboot/bootx64.efi
+                elif [ -f /vtefi/xorboot/xorboot.efi ]; then
+                    chainloader /vtefi/xorboot/xorboot.efi
+                fi
+                boot
             else
                 unset VTOY_SEARCH_NO_VTOYEFI
                 echo "xorboot NOT found ..."
@@ -179,6 +217,6 @@ else
 
 fi
 
-menuentry 'Return to previous menu [Esc]' --class=vtoyret VTOY_RET {
-    echo 'Return ...'
+menuentry "$VTLANG_RETURN_PREVIOUS" --class=vtoyret VTOY_RET {
+    echo "Return ..."
 }