1.0.05 release

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

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index 6872363785865fcf3d5fd17733e1fbd4a49333f3..92657044dfd7958dae14b6765e044cd563eba577 100644 (file)
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -30,7 +30,7 @@ function get_os_type {
     fi
 }
 
     fi
 }
 

-function locate_initrd {    
+function locate_initrd {

     vt_linux_locate_initrd 
 
     if [ -n "${vtdebug_flag}" ]; then
     vt_linux_locate_initrd 
 
     if [ -n "${vtdebug_flag}" ]; then


@@ -64,6 +64,16 @@ function distro_specify_initrd_file {
         if [ -e (loop)/casper/initrd-oem ]; then
             vt_linux_specify_initrd_file /casper/initrd-oem
         fi
         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

     fi
 }
 
     fi
 }
 


@@ -79,6 +89,10 @@ function uefi_windows_menu_func {
     
     vt_windows_chain_data ${1}${chosen_path}
 
     
     vt_windows_chain_data ${1}${chosen_path}
 

+    if [ -n "${vtdebug_flag}" ]; then
+        sleep 5
+    fi
+

     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}
     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}


@@ -95,28 +109,25 @@ function uefi_linux_menu_func {
 
         vt_linux_clear_initrd
         
 
         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
         
         # 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
         
         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
         
         locate_initrd
     fi


@@ -140,8 +151,15 @@ function uefi_iso_menu_func {
         loopback -d loop
     fi
 
         loopback -d loop
     fi
 

-    unset LoadIsoEfiDriver
-   
+    if [ -n "$vtisouefi" ]; then
+        set LoadIsoEfiDriver=on
+        unset vtisouefi
+    elif [ -n "$VTOY_ISO_UEFI_DRV" ]; then
+        set LoadIsoEfiDriver=on
+    else
+        unset LoadIsoEfiDriver
+    fi
+

     vt_chosen_img_path chosen_path
 
     if vt_is_udf ${1}${chosen_path}; then
     vt_chosen_img_path chosen_path
 
     if vt_is_udf ${1}${chosen_path}; then


@@ -153,11 +171,22 @@ function uefi_iso_menu_func {
     loopback loop ${1}${chosen_path}
     get_os_type (loop)
     
     loopback loop ${1}${chosen_path}
     get_os_type (loop)
     

-    vt_check_compatible (loop)
+    if [ -n "$vtcompat" ]; then
+        set ventoy_compatible=YES
+        unset vtcompat
+    elif [ -n "$VTOY_ISO_RAW" ]; then
+        set ventoy_compatible=YES
+    else
+        vt_check_compatible (loop)
+    fi

     
     vt_img_sector ${1}${chosen_path}
     
     if [ "$vtoy_os" = "Windows" ]; then
     
     vt_img_sector ${1}${chosen_path}
     
     if [ "$vtoy_os" = "Windows" ]; then

+        if [ "$ventoy_fs_probe" = "iso9660" ]; then
+            set ventoy_compatible=YES
+        fi
+    

         uefi_windows_menu_func  $1
     else
         uefi_linux_menu_func  $1
         uefi_windows_menu_func  $1
     else
         uefi_linux_menu_func  $1


@@ -166,6 +195,21 @@ function uefi_iso_menu_func {
     terminal_output  gfxterm    
 }
 
     terminal_output  gfxterm    
 }
 

+function uefi_iso_memdisk {    
+    vt_chosen_img_path chosen_path
+
+    echo 'Loading ISO file to memory ...'
+    vt_load_iso_to_mem ${1}${chosen_path} vtoy_iso_buf
+    
+    terminal_output  console
+    chainloader ${vtoy_path}/ventoy_x64.efi memdisk env_param=${env_param} isoefi=${LoadIsoEfiDriver} ${vtdebug_flag} mem:${vtoy_iso_buf_addr}:size:${vtoy_iso_buf_size}
+    boot
+}
+
+
+
+
+

 function legacy_windows_menu_func {
     vt_windows_reset
     
 function legacy_windows_menu_func {
     vt_windows_reset
     


@@ -200,36 +244,33 @@ function legacy_linux_menu_func {
         vt_load_cpio  $vtoy_path/ventoy.cpio
 
         vt_linux_clear_initrd
         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
         
         # 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
             fi

+        elif [ -e (loop)/boot/grub/grub.cfg ]; then                
+            vt_linux_parse_initrd_grub  file  (loop)/boot/grub/grub.cfg

         fi
         
         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
         
         locate_initrd
     fi


@@ -268,19 +309,35 @@ function legacy_iso_menu_func {
     
     get_os_type (loop)
     
     
     get_os_type (loop)
     

-    vt_check_compatible (loop)
+    if [ -n "$vtcompat" ]; then
+        set ventoy_compatible=YES
+        unset vtcompat
+    elif [ -n "$VTOY_ISO_RAW" ]; then
+        set ventoy_compatible=YES
+    else
+        vt_check_compatible (loop)
+    fi

     
     vt_img_sector ${1}${chosen_path}
     
     vt_img_sector ${1}${chosen_path}

-   
+

     if [ "$vtoy_os" = "Windows" ]; then
     if [ "$vtoy_os" = "Windows" ]; then

+        if [ "$ventoy_fs_probe" = "iso9660" ]; then
+            set ventoy_compatible=YES
+        fi

         legacy_windows_menu_func  $1
     else
         legacy_linux_menu_func  $1
     fi
 }
 
         legacy_windows_menu_func  $1
     else
         legacy_linux_menu_func  $1
     fi
 }
 

+function legacy_iso_memdisk {
+    vt_chosen_img_path chosen_path

 
 

-
+    linux16   $vtoy_path/memdisk iso raw    
+    echo "Loading ISO file to memory ..."
+    initrd16  ${1}${chosen_path}
+    boot
+}

 
 
 #############################################################
 
 
 #############################################################


@@ -291,17 +348,21 @@ function legacy_iso_menu_func {
 #############################################################
 #############################################################
 
 #############################################################
 #############################################################
 

-set VENTOY_VERSION="1.0.00"
+set VENTOY_VERSION="1.0.05"

 
 #disable timeout
 unset timeout
 
 
 #disable timeout
 unset timeout
 

+set VTOY_MEM_DISK_STR="MEMDISK"
+set VTOY_ISO_RAW_STR="ISO RAW"
+set VTOY_ISO_UEFI_DRV_STR="UEFI FS"
+

 vt_device $root  vtoy_dev
 
 if [ "$vtoy_dev" = "tftp" ]; then
     set vtoy_path=($root)    
     for vtid in 0 1 2 3; do
 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
             set iso_path=(hd$vtid,1)
             break
         fi


@@ -342,9 +403,17 @@ if vt_cmp $ventoy_img_count ne 0; then
         vt_img_name $imgid img_name
         menuentry "$img_name" {  
             if [ "$grub_platform" = "pc" ]; then
         vt_img_name $imgid img_name
         menuentry "$img_name" {  
             if [ "$grub_platform" = "pc" ]; then

-                legacy_iso_menu_func $iso_path
+                if [ -n "$VTOY_MEM_DISK" ]; then
+                    legacy_iso_memdisk $iso_path
+                else
+                    legacy_iso_menu_func $iso_path
+                fi

             else
             else

-                uefi_iso_menu_func $iso_path                
+                if [ -n "$VTOY_MEM_DISK" ]; then
+                    uefi_iso_memdisk $iso_path 
+                else
+                    uefi_iso_menu_func $iso_path                
+                fi

             fi            
         }
         
             fi            
         }