X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/790fa744f85c7dff5fe6f1905cd4268980c60dda..d551fc2e3ca74e4678c744f86c1e8f5e191f624b:/INSTALL/grub/grub.cfg

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index 2a71af3..3c939c2 100644
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -30,7 +30,7 @@ function get_os_type {
     fi
 }
 
-function locate_initrd {    
+function locate_initrd {
     vt_linux_locate_initrd 
 
     if [ -n "${vtdebug_flag}" ]; then
@@ -64,6 +64,19 @@ function distro_specify_initrd_file {
         if [ -e (loop)/casper/initrd-oem ]; then
             vt_linux_specify_initrd_file /casper/initrd-oem
         fi
+    elif [ -e (loop)/boot/grub/initrd.xz ]; then
+        vt_linux_specify_initrd_file /boot/grub/initrd.xz
+    elif [ -e (loop)/initrd.gz ]; then
+        vt_linux_specify_initrd_file /initrd.gz
+    elif [ -e (loop)/slax/boot/initrfs.img ]; then
+        vt_linux_specify_initrd_file /slax/boot/initrfs.img
+    elif [ -e (loop)/pmagic/initrd.img ]; then
+        vt_linux_specify_initrd_file /pmagic/initrd.img
+    elif [ -e (loop)/boot/initrd.xz ]; then
+        vt_linux_specify_initrd_file /boot/initrd.xz
+    elif [ -f (loop)/boot/initrd ]; then
+        vt_linux_specify_initrd_file /boot/initrd
+        
     fi
 }
 
@@ -99,29 +112,31 @@ function uefi_linux_menu_func {
 
         vt_linux_clear_initrd
         
-        for file in "boot/grub/grub.cfg" "EFI/BOOT/grub.cfg" "EFI/boot/grub.cfg" "efi/boot/grub.cfg" "EFI/BOOT/BOOTX64.conf"; do
-            if [ -e (loop)/$file ]; then
-                vt_linux_parse_initrd_grub  file  (loop)/$file
-            fi
-        done
-        
-        vt_linux_initrd_count initrd_count
+        if [ -d (loop)/pmagic ]; then
+            vt_linux_specify_initrd_file /pmagic/initrd.img
+        else
+            for file in "boot/grub/grub.cfg" "EFI/BOOT/grub.cfg" "EFI/boot/grub.cfg" "efi/boot/grub.cfg" "EFI/BOOT/BOOTX64.conf"; do
+                if [ -e (loop)/$file ]; then
+                    vt_linux_parse_initrd_grub  file  (loop)/$file
+                fi
+            done
+        fi
         
         # special process for special distros
-        if vt_cmp $initrd_count eq 0; then   
-            if [ -d (loop)/loader/entries ]; then
-                set LoadIsoEfiDriver=on
-                vt_linux_parse_initrd_grub  dir  (loop)/loader/entries/
-            elif [ -d (loop)/boot/grub ]; then
-                vt_linux_parse_initrd_grub  dir  (loop)/boot/grub/
-            fi
+        if [ -d (loop)/loader/entries ]; then
+            set LoadIsoEfiDriver=on
+            vt_linux_parse_initrd_grub  dir  (loop)/loader/entries/
+        elif [ -d (loop)/boot/grub ]; then
+            vt_linux_parse_initrd_grub  dir  (loop)/boot/grub/
         fi
         
-        vt_linux_initrd_count initrd_count
-        if vt_cmp $initrd_count eq 0; then   
-            distro_specify_initrd_file
+        if [ -e (loop)/syslinux/alt0/full.cz ]; then
+            set LoadIsoEfiDriver=on
+            set FirstTryBootFile='@EFI@BOOT@grubx64.efi'
         fi
         
+        distro_specify_initrd_file
+        
         locate_initrd
     fi
     
@@ -129,7 +144,7 @@ function uefi_linux_menu_func {
 
     if [ -n "$vtoy_chain_mem_addr" ]; then
         terminal_output  console       
-        chainloader ${vtoy_path}/ventoy_x64.efi  env_param=${env_param} isoefi=${LoadIsoEfiDriver} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
+        chainloader ${vtoy_path}/ventoy_x64.efi  env_param=${env_param} isoefi=${LoadIsoEfiDriver} FirstTry=${FirstTryBootFile} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
         boot
     else
         echo "chain empty failed"
@@ -202,7 +217,6 @@ function uefi_iso_memdisk {
 
 
 
-
 function legacy_windows_menu_func {
     vt_windows_reset
     
@@ -237,36 +251,33 @@ function legacy_linux_menu_func {
         vt_load_cpio  $vtoy_path/ventoy.cpio
 
         vt_linux_clear_initrd
-                
-        for dir in "isolinux" "boot/isolinux" "boot/x86_64/loader" "syslinux" "boot/syslinux"; do
-            if [ -d (loop)/$dir ]; then
-                vt_linux_parse_initrd_isolinux   (loop)/$dir/
-            fi
-        done
         
-        vt_linux_initrd_count initrd_count
+        if [ -d (loop)/pmagic ]; then
+            vt_linux_specify_initrd_file /pmagic/initrd.img
+        else
+            for dir in "isolinux" "boot/isolinux" "boot/x86_64/loader" "syslinux" "boot/syslinux"; do
+                if [ -d (loop)/$dir ]; then
+                    vt_linux_parse_initrd_isolinux   (loop)/$dir/
+                fi
+            done
+        fi
         
         # special process for special distros
-        if vt_cmp $initrd_count eq 0; then   
-            #archlinux
-            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/
-                
-            #manjaro
-            elif [ -d (loop)/manjaro ]; then
-                if [ -e (loop)/boot/grub/kernels.cfg ]; then
-                    vt_linux_parse_initrd_grub  file  (loop)/boot/grub/kernels.cfg
-                fi
-            elif [ -e (loop)/boot/grub/grub.cfg ]; then                
-                vt_linux_parse_initrd_grub  file  (loop)/boot/grub/grub.cfg
+        #archlinux
+        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/
+            
+        #manjaro
+        elif [ -d (loop)/manjaro ]; then
+            if [ -e (loop)/boot/grub/kernels.cfg ]; then
+                vt_linux_parse_initrd_grub  file  (loop)/boot/grub/kernels.cfg
             fi
+        elif [ -e (loop)/boot/grub/grub.cfg ]; then                
+            vt_linux_parse_initrd_grub  file  (loop)/boot/grub/grub.cfg
         fi
         
-        vt_linux_initrd_count initrd_count
-        if vt_cmp $initrd_count eq 0; then   
-            distro_specify_initrd_file
-        fi
+        distro_specify_initrd_file
         
         locate_initrd
     fi
@@ -344,7 +355,7 @@ function legacy_iso_memdisk {
 #############################################################
 #############################################################
 
-set VENTOY_VERSION="1.0.04"
+set VENTOY_VERSION="1.0.06"
 
 #disable timeout
 unset timeout
@@ -358,7 +369,7 @@ vt_device $root  vtoy_dev
 if [ "$vtoy_dev" = "tftp" ]; then
     set vtoy_path=($root)    
     for vtid in 0 1 2 3; do
-        if [ -d (hd$vtid,2)/grub ]; then
+        if [ -d (hd$vtid,2)/ventoy ]; then
             set iso_path=(hd$vtid,1)
             break
         fi