X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/6ded3355272edb9af63d97aad646bbd7c6f12583..042ca4b5e36ffbe5897083e7bce2cf76dc145efd:/INSTALL/grub/grub.cfg

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index 70c97b2..d05e42a 100644
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -311,18 +311,15 @@ function distro_specify_initrd_file_phase2 {
         vt_linux_specify_initrd_file /antiX/initrd.gz
     elif [ -f (loop)/360Disk/initrd.gz ]; then
         vt_linux_specify_initrd_file /360Disk/initrd.gz
+    elif [ -f (loop)/porteus/initrd.xz ]; then
+        vt_linux_specify_initrd_file /porteus/initrd.xz
     
     fi
 }
 
 function ventoy_get_ghostbsd_ver {
-
-    # vt_parse_iso_create_date "$1/${chosen_path}" vt_create_date    
-    # if regexp "^202005" "$vt_create_date"; then
-        # set vt_freebsd_ver=12.x
-    # fi
-    
-    set vt_freebsd_ver=12.x
+    # fallback to parse version from elf /boot/kernel/kernel
+    set vt_freebsd_ver=xx
 }
 
 function ventoy_get_furybsd_ver {
@@ -364,11 +361,18 @@ function ventoy_get_truenas_ver {
 }
 
 function ventoy_get_midnightbsd_ver {   
-    set vt_freebsd_ver=11.x
+    if vt_str_begin "$vt_volume_id" "1_"; then
+        set vt_freebsd_ver=11.x
+    elif vt_str_begin "$vt_volume_id" "2_"; then
+        set vt_freebsd_ver=2.x
+    elif vt_str_begin "$vt_volume_id" "3_"; then
+        set vt_freebsd_ver=3.x
+    fi
 }
 
 function ventoy_freebsd_proc {
     set vtFreeBsdDistro=FreeBSD
+    set vt_freebsd_ver=xx
 
     if vt_strstr "$vt_volume_id" "GHOSTBSD"; then
         ventoy_get_ghostbsd_ver "$1" "${chosen_path}"
@@ -419,8 +423,11 @@ function ventoy_freebsd_proc {
         fi
     elif vt_strstr "${chosen_path}" "MidnightBSD"; then
         set vt_freebsd_ver=9.x
-    else
-        set vt_freebsd_ver=12.x
+    fi
+    
+    
+    if [ -e (loop)/usr/freebsd-dist/cloninst.sh ]; then
+        set vtFreeBsdDistro=ClonOS
     fi
     
     set vt_freebsd_bit=64
@@ -431,10 +438,20 @@ function ventoy_freebsd_proc {
             fi
             break
         fi
-    done    
+    done
+
+    if [ "$vt_freebsd_ver" = "xx" ]; then
+        if [ -e (loop)/boot/kernel/kernel ]; then
+            vt_unix_parse_freebsd_ver_elf (loop)/boot/kernel/kernel $vt_freebsd_bit vt_freebsd_ver
+        fi
+        
+        if [ "$vt_freebsd_ver" = "xx" ]; then
+            set vt_freebsd_ver=13.x        
+        fi
+    fi
 
     if [ -n "${vtdebug_flag}" ]; then
-        echo "This is FreeBSD $vt_freebsd_ver ${vt_freebsd_bit}bit"
+        echo "This is $vtFreeBsdDistro $vt_freebsd_ver ${vt_freebsd_bit}bit"
     fi
     
     unset vt_unix_mod_path
@@ -445,10 +462,6 @@ function ventoy_freebsd_proc {
         fi
     done
     
-    if [ -e (loop)/usr/freebsd-dist/cloninst.sh ]; then
-        set vtFreeBsdDistro=ClonOS
-    fi
-    
     vt_unix_replace_ko $vt_unix_mod_path (vtunix)/ventoy_unix/$vtFreeBsdDistro/geom_ventoy_ko/$vt_freebsd_ver/$vt_freebsd_bit/geom_ventoy.ko.xz
     vt_unix_replace_conf FreeBSD "${1}${chosen_path}"
 }
@@ -543,7 +556,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 +658,49 @@ 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 vt_check_mode 3; then
+            ventoy_debug_pause
+        else
+            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
+        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 +853,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
         
@@ -849,9 +902,39 @@ function legacy_linux_menu_func {
     ventoy_debug_pause
     
     if [ -n "$vtoy_chain_mem_addr" ]; then
-        ventoy_acpi_param ${vtoy_chain_mem_addr} 2048
-        linux16   $vtoy_path/ipxe.krn ${vtdebug_flag}  mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
-        boot
+        if vt_check_mode 3; then
+            ventoy_acpi_param ${vtoy_chain_mem_addr} 2048
+            ventoy_cli_console
+        
+            # 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
+
+            vt_unset_boot_opt
+            set root=$vtback_root        
+            set theme=$vtback_theme
+            vt_pop_last_entry
+            ventoy_gui_console
+        else
+            ventoy_acpi_param ${vtoy_chain_mem_addr} 2048
+            linux16   $vtoy_path/ipxe.krn ${vtdebug_flag}  mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
+            boot
+        fi
     else
         echo "chain empty failed"
         ventoy_pause
@@ -937,7 +1020,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 +1046,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
     
@@ -992,7 +1077,7 @@ function iso_common_menuentry {
     vt_parse_iso_volume "${vtoy_iso_part}${vt_chosen_path}" vt_system_id vt_volume_id vt_volume_space
     if [ $vt_volume_space -ne $vt_chosen_size ]; then        
         vt_mod $vt_chosen_size 2048 vt_chosen_size_mod
-        if [ $vt_volume_space -gt $vt_chosen_size -o $vt_chosen_size_mod -ne 0 ]; then
+        if [ $vt_chosen_size_mod -ne 0 ]; then
             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"
@@ -1276,7 +1361,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 +1387,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 +1405,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 +1427,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 +1448,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 +1470,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 +1494,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 +1511,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 +1527,68 @@ function ventoy_img_batocera {
     vt_unset_boot_opt
 }
 
+function ventoy_img_openwrt {
+    if [ -e (vtimghd,2)/lib64 ]; then
+        set ventoy_busybox_ver=64
+    fi
+
+    if [ ! -f ${vtoy_iso_part}/ventoy/ventoy_openwrt.xz ]; then
+        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 (请按 回车 键返回) ..."
+        read vtInputKey
+        ventoy_cli_console
+        return
+    fi
+
+    if vt_img_check_range "${vtoy_iso_part}${vt_chosen_path}"; then
+        ventoy_debug_pause
+    else
+        ventoy_gui_console
+        echo -e "\n IMG file need processed. Please refer https://www.ventoy.net/en/doc_openwrt.html.\n"
+        echo -e " 此 IMG 文件必须处理之后才能支持。请参考 https://www.ventoy.net/cn/doc_openwrt.html\n"
+        echo -e "\n press ENTER to exit (请按 回车 键返回) ..."
+        read vtInputKey
+        ventoy_cli_console
+        return
+    fi
+    
+
+    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_img_extra_initrd_append  ${vtoy_iso_part}/ventoy/ventoy_openwrt.xz
+    
+
+    #boot image file
+    vt_set_boot_opt rdinit=/vtoy/vtoy ventoyos=openwrt
+    vt_img_hook_root
+    
+    set root=(vtimghd,1)
+    configfile (vtimghd,1)/boot/grub/grub.cfg
+
+    vt_img_unhook_root
+    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,11 +1627,14 @@ 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
 
+
     vt_get_fs_label (vtimghd,1) vtImgHd1Label
-    if [ -d (vtimghd,2)/lib ]; then
+    if [ -d (vtimghd,2)/lib ]; then        
         vt_get_fs_label (vtimghd,2) vtImgHd2Label
     fi
     
@@ -1492,6 +1642,7 @@ function img_common_menuentry {
         vt_1st_line (vtimghd,1)/etc/hostname vtImgHostname
     fi
     
+    
     if [ -e (vtimghd,1)/easy.sfs ]; then
         ventoy_img_easyos
     elif [ -e (vtimghd,1)/volumio.initrd ]; then
@@ -1506,10 +1657,14 @@ 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
         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
@@ -1530,6 +1685,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 +1702,7 @@ function img_unsupport_menuentry {
 #############################################################
 #############################################################
 
-set VENTOY_VERSION="1.0.34"
+set VENTOY_VERSION="1.0.41"
 
 #ACPI not compatible with Window7/8, so disable by default
 set VTOY_PARAM_NO_ACPI=1
@@ -1558,6 +1714,7 @@ set VTOY_DEFAULT_MENU_MODE=0
 
 set VTOY_MEM_DISK_STR="[Memdisk]"
 set VTOY_ISO_RAW_STR="Compatible Mode"
+set VTOY_GRUB2_MODE_STR="GRUB2 Mode"
 set VTOY_ISO_UEFI_DRV_STR="UEFI FS"
 
 set VTOY_F2_CMD="ventoy_power"
@@ -1574,6 +1731,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"    
@@ -1684,6 +1844,9 @@ else
     terminal_output  gfxterm
 fi
 
+if [ -n "$VTOY_DEFAULT_KBD_LAYOUT" ]; then
+    set_keyboard_layout "$VTOY_DEFAULT_KBD_LAYOUT"
+fi
 
 if [ -n "$VTOY_PLUGIN_SYNTAX_ERROR" ]; then
     clear
@@ -1703,6 +1866,8 @@ for vtTFile in ventoy.json ventoy_grub.cfg; do
     fi
 done
 
+#clear all input key before show main menu
+vt_clear_key
 
 #export necessary variable
 export theme
@@ -1711,6 +1876,7 @@ export gfxpayload
 export vtoydev
 export vtoy_path
 export vtdebug_flag
+export vtoy_iso_fs
 export vtoy_iso_part
 export vtoy_efi_part
 export VENTOY_VERSION