X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/277b134bf65084856b5e34359e0a64e69c81adad..d5b829f8e8c8367b032b4bb57a8fc37701d42e17:/INSTALL/grub/grub.cfg

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index 2a71af3..d9a59fa 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,30 @@ 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
+    elif [ -f (loop)/boot/x86_64/loader/initrd ]; then
+        vt_linux_specify_initrd_file /boot/x86_64/loader/initrd
+    elif [ -f (loop)/boot/initramfs-x86_64.img ]; then
+        vt_linux_specify_initrd_file /boot/initramfs-x86_64.img
+        
+
+    fi
+}
+
+function distro_specify_initrd_file_phase2 {
+    if [ -f (loop)/boot/initrd.img ]; then
+        vt_linux_specify_initrd_file /boot/initrd.img
     fi
 }
 
@@ -99,27 +123,40 @@ 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
+        
+        vt_linux_initrd_count vtcount
+        if [ $vtcount -eq 0 ]; then
+            distro_specify_initrd_file_phase2
+            
+            if [ "$vt_efi_dir" = "NO" ]; then
+                if [ -f (loop)/efi.img ];  then
+                    vt_add_replace_file 0 "initrd"
+                fi
+            fi
         fi
         
         locate_initrd
@@ -129,7 +166,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"
@@ -164,6 +201,14 @@ function uefi_iso_menu_func {
     loopback loop ${1}${chosen_path}
     get_os_type (loop)
     
+    if [ -d (loop)/EFI ]; then
+        set vt_efi_dir=YES
+    elif [ -d (loop)/efi ]; then
+        set vt_efi_dir=YES
+    else
+        set vt_efi_dir=NO
+    fi
+    
     if [ -n "$vtcompat" ]; then
         set ventoy_compatible=YES
         unset vtcompat
@@ -178,6 +223,8 @@ function uefi_iso_menu_func {
     if [ "$vtoy_os" = "Windows" ]; then
         if [ "$ventoy_fs_probe" = "iso9660" ]; then
             set ventoy_compatible=YES
+        elif [ -f (loop)/HBCD_PE.ini ]; then
+            set ventoy_compatible=YES
         fi
     
         uefi_windows_menu_func  $1
@@ -202,7 +249,6 @@ function uefi_iso_memdisk {
 
 
 
-
 function legacy_windows_menu_func {
     vt_windows_reset
     
@@ -237,35 +283,37 @@ 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
+        distro_specify_initrd_file
+        
+        vt_linux_initrd_count vtcount
+        if [ $vtcount -eq 0 ]; then
+            distro_specify_initrd_file_phase2
         fi
         
         locate_initrd
@@ -319,7 +367,10 @@ function legacy_iso_menu_func {
     if [ "$vtoy_os" = "Windows" ]; then
         if [ "$ventoy_fs_probe" = "iso9660" ]; then
             set ventoy_compatible=YES
+        elif [ -f (loop)/HBCD_PE.ini ]; then
+            set ventoy_compatible=YES
         fi
+        
         legacy_windows_menu_func  $1
     else
         legacy_linux_menu_func  $1
@@ -344,7 +395,7 @@ function legacy_iso_memdisk {
 #############################################################
 #############################################################
 
-set VENTOY_VERSION="1.0.04"
+set VENTOY_VERSION="1.0.07"
 
 #disable timeout
 unset timeout
@@ -358,7 +409,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
@@ -374,7 +425,11 @@ if [ -f $iso_path/ventoy/ventoy.json ]; then
    vt_load_plugin $iso_path
 fi
 
-terminal_output  gfxterm
+if [ -n "$vtoy_gfxmode" ]; then
+    set gfxmode=$vtoy_gfxmode
+else
+    set gfxmode=1920x1080,1366x768,1024x768
+fi
 
 if [ -n "$vtoy_theme" ]; then
     set theme=$vtoy_theme
@@ -382,11 +437,7 @@ else
     set theme=$prefix/themes/ventoy/theme.txt
 fi
 
-if [ -n "$vtoy_gfxmode" ]; then
-    set gfxmode=$vtoy_gfxmode
-else
-    set gfxmode=1024x768
-fi
+terminal_output  gfxterm
 
 #colect all image files (iso files)
 set ventoy_img_count=0