DragonFly BSD support

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

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index 0540d462162a81619279932604ed33f5335b6784..3e1528f2699d3d32b2cdced38f5de364ca2e83e9 100644 (file)
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -106,13 +106,13 @@ function get_os_type {
     fi
 
     if [ -n "${vtdebug_flag}" ]; then
-        echo ISO is $vtoy_os
+        echo ISO is "$vtoy_os"
     fi
 }
 
 function vt_check_compatible_pe {
     #Check for PE without external tools
-    if [ -f $1/HBCD_PE.ini ]; then
+    if [ -f "$1/HBCD_PE.ini" ]; then
         set ventoy_compatible=YES        
     fi
 }
@@ -270,6 +270,8 @@ function distro_specify_initrd_file_phase2 {
         fi
     elif [ -f (loop)/blackarch/boot/x86_64/archiso.img ]; then 
         vt_linux_specify_initrd_file /blackarch/boot/x86_64/archiso.img
+    elif [ -f (loop)/blackarch/boot/x86_64/initramfs-linux.img ]; then 
+        vt_linux_specify_initrd_file /blackarch/boot/x86_64/initramfs-linux.img
         
     elif [ -f (loop)/install.amd/initrd.gz ]; then
         vt_linux_specify_initrd_file /live/initrd2.img
@@ -277,7 +279,12 @@ function distro_specify_initrd_file_phase2 {
         vt_linux_specify_initrd_file /install.amd/gtk/initrd.gz
     elif [ -f (loop)/boot/grub/kernels.cfg ]; then
         vt_linux_parse_initrd_grub  file  (loop)/boot/grub/kernels.cfg
-
+    elif [ -f (loop)/austrumi/initrd.gz ]; then
+        vt_linux_specify_initrd_file /austrumi/initrd.gz
+        if [ -f (loop)/EFI/BOOT/bootx64.efi ]; then
+            vt_cpio_busybox64 "64h"
+        fi
+        
     fi
 }
 
@@ -543,6 +550,12 @@ function uefi_linux_menu_func {
             elif [ -d (loop)/blackarch ]; then
                 if [ -f (loop)/blackarch/boot/x86_64/archiso.img ]; then
                     vt_add_replace_file $vtindex "EFI\\archiso\\archiso.img"
+                elif [ -f (loop)/blackarch/boot/x86_64/initramfs-linux.img ]; then
+                    vt_add_replace_file $vtindex "blackarch\\boot\\x86_64\\initramfs-linux.img"
+                fi
+            elif [ -d (loop)/anarchy ]; then
+                if [ -f (loop)/anarchy/boot/x86_64/initramfs-linux.img ]; then
+                    vt_add_replace_file $vtindex "anarchy\\boot\\x86_64\\initramfs-linux.img"
                 fi
             elif [ -d (loop)/parabola ]; then
                 if [ -f (loop)/parabola/boot/x86_64/parabolaiso.img ]; then
@@ -748,6 +761,8 @@ function legacy_linux_menu_func {
         if [ -d (loop)/arch/boot/syslinux ]; then
             vt_linux_parse_initrd_isolinux   (loop)/arch/boot/syslinux/  /arch/
             vt_linux_parse_initrd_isolinux   (loop)/arch/boot/syslinux/  /arch/boot/syslinux/
+        elif [ -d (loop)/anarchy/boot/syslinux ]; then
+            vt_linux_parse_initrd_isolinux   (loop)/anarchy/boot/syslinux/  /anarchy/
             
         #manjaro
         elif [ -d (loop)/manjaro ]; then
@@ -1382,15 +1397,15 @@ function img_common_menuentry {
         ventoy_img_easyos
     elif [ -e (vtimghd,1)/volumio.initrd ]; then
         ventoy_img_volumio
-    elif vt_str_begin $vtImgHd1Label "LAKKA"; then
+    elif vt_str_begin "$vtImgHd1Label" "LAKKA"; then
         ventoy_img_openelec lakka
-    elif vt_str_begin $vtImgHd1Label "LIBREELEC"; then
+    elif vt_str_begin "$vtImgHd1Label" "LIBREELEC"; then
         ventoy_img_openelec LibreELEC
-    elif vt_str_begin $vtImgHd1Label "paldo-live"; then
+    elif vt_str_begin "$vtImgHd1Label" "paldo-live"; then
         ventoy_img_paldo
-    elif vt_str_begin $vtImgHostname "freedombox"; then
+    elif vt_str_begin "$vtImgHostname" "freedombox"; then
         ventoy_img_freedombox
-    elif vt_str_begin $vtImgHd1Label "BATOCERA"; then
+    elif vt_str_begin "$vtImgHd1Label" "BATOCERA"; then
         ventoy_img_batocera
     elif [ "$vtImgHd2Label" = "RECALBOX" ]; then
         ventoy_img_recalbox
@@ -1432,7 +1447,7 @@ function img_unsupport_menuentry {
 #############################################################
 #############################################################
 
-set VENTOY_VERSION="1.0.30"
+set VENTOY_VERSION="1.0.31"
 
 #ACPI not compatible with Window7/8, so disable by default
 set VTOY_PARAM_NO_ACPI=1
@@ -1453,14 +1468,16 @@ set VTOY_F6_CMD="ventoy_ext_menu"
 
 if [ "$grub_platform" = "pc" ]; then
     set VTOY_TEXT_MENU_VER="Ventoy $VENTOY_VERSION BIOS  www.ventoy.net"
-else
-    set VTOY_TEXT_MENU_VER="Ventoy $VENTOY_VERSION UEFI  www.ventoy.net"    
+else    
     if [ "$grub_cpu" = "i386" ]; then
         set VTOY_EFI_ARCH=ia32
+        set VTOY_TEXT_MENU_VER="Ventoy $VENTOY_VERSION IA32  www.ventoy.net"
     elif [ "$grub_cpu" = "arm64" ]; then
         set VTOY_EFI_ARCH=aa64
+        set VTOY_TEXT_MENU_VER="Ventoy $VENTOY_VERSION AA64  www.ventoy.net"
     else
         set VTOY_EFI_ARCH=x64
+        set VTOY_TEXT_MENU_VER="Ventoy $VENTOY_VERSION UEFI  www.ventoy.net"    
     fi
 fi
 
@@ -1505,6 +1522,7 @@ vt_load_part_table $vtoydev
 if [ -f $vtoy_iso_part/ventoy/ventoy.json ]; then
    clear
    vt_load_plugin $vtoy_iso_part
+   clear
 fi
 
 if [ -n "$VTOY_MENU_TIMEOUT" ]; then