X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/cbbd57eee5980acc6879e119fe6b8913285f2af6..33cc1e271a264aad4de9be0ca1bdf36aac165211:/INSTALL/grub/grub.cfg

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index 3f44dad..3d45f5a 100644
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -543,7 +543,7 @@ function uefi_linux_menu_func {
             loopback loop "$1$2"
         fi
         
-        vt_load_cpio  ${vtoy_path}/ventoy.cpio   "$2" "$1" "busybox=$ventoy_busybox_ver"
+        vt_load_cpio  $vtoy_path   "$2" "$1" "busybox=$ventoy_busybox_ver"
         
         vt_linux_clear_initrd
         
@@ -645,9 +645,45 @@ function uefi_linux_menu_func {
 
     if [ -n "$vtoy_chain_mem_addr" ]; then
         ventoy_acpi_param ${vtoy_chain_mem_addr} 2048
-        ventoy_cli_console       
-        chainloader ${vtoy_path}/ventoy_${VTOY_EFI_ARCH}.efi  env_param=${env_param} isoefi=${LoadIsoEfiDriver} FirstTry=${FirstTryBootFile} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
-        boot
+        ventoy_cli_console     
+        
+        if [ "$VTOY_EFI_ARCH" != "mips" ]; then
+            chainloader ${vtoy_path}/ventoy_${VTOY_EFI_ARCH}.efi fallback env_param=${env_param} isoefi=${LoadIsoEfiDriver} FirstTry=${FirstTryBootFile} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
+            boot
+        fi
+
+        # fallback
+        set vtback_root=$root        
+        vt_push_last_entry
+        set vtback_theme=$theme
+        unset theme
+        
+        vt_trailer_cpio "$vtoy_iso_part" "$vt_chosen_path" noinit
+        vt_set_boot_opt rdinit=/vtoy/vtoy
+
+        set root=(loop)
+        set vtback_cfg_find=0
+        for cfg in "/boot/grub/grub.cfg" "/EFI/BOOT/grub.cfg" "/EFI/debian/grub.cfg" "EFI/boot/grub.cfg" "efi/boot/grub.cfg" "/grub/grub.cfg" "EFI/BOOT/BOOTX64.conf"; do
+            if [ -e "$cfg" ]; then
+                set vtback_cfg_find=1
+                configfile "$cfg"
+                break
+            fi
+        done
+
+        if [ "$vtback_cfg_find" = "0" ]; then
+            echo " "
+            echo "No bootfile found for UEFI!"
+            echo "Maybe the image does not support $VTOY_EFI_ARCH UEFI"
+            echo " "
+            sleep 30
+        fi
+
+        vt_unset_boot_opt
+        set root=$vtback_root        
+        set theme=$vtback_theme
+        vt_pop_last_entry
+        ventoy_gui_console
     else
         echo "chain empty failed"
         ventoy_pause
@@ -800,7 +836,7 @@ function legacy_linux_menu_func {
             loopback loop "$1$2"
         fi
     
-        vt_load_cpio  $vtoy_path/ventoy.cpio  "$2" "$1" "busybox=$ventoy_busybox_ver"
+        vt_load_cpio  $vtoy_path  "$2" "$1" "busybox=$ventoy_busybox_ver"
 
         vt_linux_clear_initrd
         
@@ -937,7 +973,7 @@ function iso_endless_os_proc {
     loopback loop "${1}${2}"
     vt_img_sector "${1}${2}"
 
-    vt_load_cpio  $vtoy_path/ventoy.cpio  "$2" "$1"  "busybox=$ventoy_busybox_ver"
+    vt_load_cpio  $vtoy_path  "$2" "$1"  "busybox=$ventoy_busybox_ver"
     vt_trailer_cpio "$1" "$2" noinit
     
     ventoy_debug_pause
@@ -963,6 +999,8 @@ function ventoy_iso_busybox_ver {
 
     if [ "$VTOY_EFI_ARCH" = "aa64" ]; then
         set ventoy_busybox_ver=a64
+    elif [ "$VTOY_EFI_ARCH" = "mips" ]; then
+        set ventoy_busybox_ver=m64
     else
         set ventoy_busybox_ver=32
     
@@ -1276,7 +1314,7 @@ function vtoy_unsupport_menuentry {
 
 
 function ventoy_img_easyos {
-    vt_load_cpio  $vtoy_path/ventoy.cpio  "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver"
+    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
     
     loopback easysfs (vtimghd,1)/easy.sfs
@@ -1302,7 +1340,7 @@ function ventoy_img_easyos {
 }
 
 function ventoy_img_volumio {
-    vt_load_cpio  $vtoy_path/ventoy.cpio  "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver"
+    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
@@ -1320,7 +1358,7 @@ function ventoy_img_volumio {
 function ventoy_img_openelec {
     elec_ver=$1
     
-    vt_load_cpio  $vtoy_path/ventoy.cpio  "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver"
+    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
 
     loopback vtloopex $vtoy_efi_part/ventoy/vtloopex.cpio    
@@ -1342,7 +1380,7 @@ function ventoy_img_openelec {
 
 
 function ventoy_img_freedombox {
-    vt_load_cpio  $vtoy_path/ventoy.cpio  "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver"
+    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
 
     vt_get_lib_module_ver (vtimghd,1) /lib/modules/ vt_module_ver
@@ -1363,7 +1401,7 @@ function ventoy_img_freedombox {
 }
 
 function ventoy_img_paldo {
-    vt_load_cpio  $vtoy_path/ventoy.cpio  "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver"
+    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
@@ -1385,7 +1423,7 @@ function ventoy_img_paldo {
 }
 
 function ventoy_img_ubos {
-    vt_load_cpio  $vtoy_path/ventoy.cpio  "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver"
+    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
 
     vt_get_lib_module_ver (vtimghd,3) /lib/modules/ vt_module_ver
@@ -1409,7 +1447,7 @@ function ventoy_img_ubos {
 }
 
 function ventoy_img_recalbox {
-    vt_load_cpio  $vtoy_path/ventoy.cpio  "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver"
+    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
@@ -1426,7 +1464,7 @@ function ventoy_img_recalbox {
 }
 
 function ventoy_img_batocera {
-    vt_load_cpio  $vtoy_path/ventoy.cpio  "${vt_chosen_path}" ${vtoy_iso_part} "busybox=$ventoy_busybox_ver"
+    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
@@ -1442,6 +1480,23 @@ function ventoy_img_batocera {
     vt_unset_boot_opt
 }
 
+function ventoy_img_tails {
+    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 live-media=/dev/dm-1 ventoyos=tails
+    vt_img_hook_root
+    
+    set root=(vtimghd,1)
+    configfile (vtimghd,1)/efi/debian/grub.cfg
+
+    vt_img_unhook_root
+    vt_unset_boot_opt
+}
+
 function ventoy_img_memtest86 {      
     chainloader (vtimghd,1)/efi/boot/BOOTX64.efi
     boot
@@ -1480,6 +1535,8 @@ function img_common_menuentry {
     set vtback_root=$root
     ventoy_cli_console
     vt_push_last_entry
+    set vtback_theme=$theme
+    unset theme
 
     vt_img_extra_initrd_reset
 
@@ -1506,6 +1563,8 @@ function img_common_menuentry {
         ventoy_img_freedombox
     elif vt_str_begin "$vtImgHd1Label" "BATOCERA"; then
         ventoy_img_batocera
+    elif vt_str_begin "$vtImgHd1Label" "Tails"; then
+        ventoy_img_tails
     elif [ "$vtImgHd2Label" = "RECALBOX" ]; then
         ventoy_img_recalbox
     elif [ -f (vtimghd,2)/loader/entries/ubos.conf ]; then
@@ -1530,6 +1589,7 @@ function img_common_menuentry {
 
     set root=$vtback_root
     vt_pop_last_entry
+    set theme=$vtback_theme
     ventoy_gui_console
     set ventoy_compatible=NO
 }
@@ -1546,7 +1606,7 @@ function img_unsupport_menuentry {
 #############################################################
 #############################################################
 
-set VENTOY_VERSION="1.0.36"
+set VENTOY_VERSION="1.0.38"
 
 #ACPI not compatible with Window7/8, so disable by default
 set VTOY_PARAM_NO_ACPI=1
@@ -1574,6 +1634,9 @@ else
     elif [ "$grub_cpu" = "arm64" ]; then
         set VTOY_EFI_ARCH=aa64
         set VTOY_TEXT_MENU_VER="Ventoy $VENTOY_VERSION AA64  www.ventoy.net"
+    elif [ "$grub_cpu" = "mips64el" ]; then
+        set VTOY_EFI_ARCH=mips
+        set VTOY_TEXT_MENU_VER="Ventoy $VENTOY_VERSION MIPS  www.ventoy.net"
     else
         set VTOY_EFI_ARCH=x64
         set VTOY_TEXT_MENU_VER="Ventoy $VENTOY_VERSION UEFI  www.ventoy.net"