1.0.13 release

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

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index b1ef9b0a5e46d30cc417a75443d4d7a909ab1eca..e7627f651155f55a37eee481058fdd3a8d3b5a96 100644 (file)
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -16,60 +16,91 @@
 # 
 #************************************************************************************
 
 # 
 #************************************************************************************
 

+function ventoy_pause {
+    if [ -n "${vtdebug_flag}" ]; then
+        echo "press Enter to continue ......"
+        read vtTmpPause
+    fi
+}
+
+function ventoy_debug_pause {
+    if [ -n "${vtdebug_flag}" ]; then
+        echo "press Enter to continue ......"
+        read vtTmpPause
+    fi
+}
+
+

 function ventoy_power {
 function ventoy_power {

-    configfile ($root)/grub/power.cfg
+    configfile $prefix/power.cfg
+}
+
+function ventoy_diagnosis {    
+    configfile $prefix/debug.cfg
+}
+
+function ventoy_localboot {    
+    configfile $prefix/localboot.cfg

 }
 
 function get_os_type {
 }
 
 function get_os_type {

-    set vtoy_os=Linux    
-    for file in "efi/microsoft" "sources/boot.wim" "boot/bcd" "bootmgr.efi" "boot/etfsboot.com" "BOOT/etfsboot.com"; do
-        if [ -e $1/$file ]; then
+    set vtoy_os=Linux
+    
+    for file in "efi/microsoft/boot/bcd" "sources/boot.wim" "boot/bcd" "bootmgr.efi" "boot/etfsboot.com" ; do        
+        if vt_file_exist_nocase (loop)/$file; then        

             set vtoy_os=Windows
             break
         fi
     done
             set vtoy_os=Windows
             break
         fi
     done

-    
+

     if [ -n "${vtdebug_flag}" ]; then
         echo ISO is $vtoy_os
     fi
 }
 
     if [ -n "${vtdebug_flag}" ]; then
         echo ISO is $vtoy_os
     fi
 }
 

-function vt_check_pe {
-    unset VT_PE_SUPPORT
-
+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
-        set VT_PE_SUPPORT=YES
-    elif [ -f $1/easyu.flg ]; then
-        set VT_PE_SUPPORT=YES
-    elif [ -f $1/USM.ICO ]; then
-        set VT_PE_SUPPORT=YES
-    elif [ -d $1/USM_TOOL ]; then
-        set VT_PE_SUPPORT=YES
+        set ventoy_compatible=YES        

     fi
 }
 
 function locate_initrd {
     vt_linux_locate_initrd 
 
     fi
 }
 
 function locate_initrd {
     vt_linux_locate_initrd 
 

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

         vt_linux_dump_initrd
         vt_linux_dump_initrd

-        sleep 5
+        ventoy_debug_pause

     fi
 }
 
     fi
 }
 

-function find_wim_file {
-    unset ventoy_wim_file
+function locate_wim {
+    vt_windows_locate_wim_patch (loop)

     
     

-    for file in "sources/boot.wim" "sources/BOOT.WIM" "Sources/Win10PEx64.WIM" "boot/BOOT.WIM" \
-                "winpe_x64.wim" "boot/10pex64.wim" "BOOT/USM1PE6L.WIM" "BOOT/USM1PE6F.WIM"; do
-        if [ -e $1/$file ]; then
-            set ventoy_wim_file=$1/$file
-            break
-        fi
-    done
+    if [ -n "${vtdebug_flag}" ]; then
+        echo '###############################################'
+        vt_dump_wim_patch
+        echo '###############################################'
+        ventoy_debug_pause
+    fi

 }
 
 }
 

+function distro_specify_wim_patch {
+    if [ -d (loop)/h3pe ]; then
+        vt_windows_collect_wim_patch wim /BOOT/H3_10PE.WIM
+        vt_windows_collect_wim_patch wim /BOOT/H3_7PE.WIM
+        vt_windows_collect_wim_patch wim /BOOT/H3_8PE.WIM
+        vt_windows_collect_wim_patch wim /BOOT/H3_81PE.WIM
+    fi
+}
+
+function distro_specify_wim_patch_phase2 {
+    if [ -f (loop)/boot/boot.wim ]; then
+        vt_windows_collect_wim_patch wim /boot/boot.wim
+    fi
+}
+
+

 function distro_specify_initrd_file {
     if [ -e (loop)/boot/all.rdz ]; then
         vt_linux_specify_initrd_file /boot/all.rdz
 function distro_specify_initrd_file {
     if [ -e (loop)/boot/all.rdz ]; then
         vt_linux_specify_initrd_file /boot/all.rdz


@@ -127,32 +158,50 @@ function distro_specify_initrd_file_phase2 {
 
 function uefi_windows_menu_func {
     vt_windows_reset
 
 function uefi_windows_menu_func {
     vt_windows_reset

-    
-    if [ "$ventoy_compatible" = "NO" ]; then        
-        find_wim_file (loop)
-        if [ -n "$ventoy_wim_file" ]; then
-            vt_windows_locate_wim $ventoy_wim_file
+
+    if [ "$ventoy_compatible" = "NO" ]; then   
+        
+        if [ "$ventoy_fs_probe" = "iso9660" ]; then
+            loopback -d loop
+            vt_iso9660_nojoliet 1            
+            loopback loop $1$2

         fi
         fi

-    fi
-    
-    vt_windows_chain_data ${1}${chosen_path}
+        
+        for file in "efi/microsoft/boot/bcd"; do
+            vt_windows_collect_wim_patch bcd (loop)/$file                
+        done

 
 

-    if [ -n "${vtdebug_flag}" ]; then
-        sleep 5
+        vt_windows_count_wim_patch vt_wim_cnt
+        if [ $vt_wim_cnt -eq 0 ]; then
+            distro_specify_wim_patch_phase2
+        fi
+        
+        ventoy_debug_pause        
+        locate_wim

     fi
 
     fi
 

+    vt_windows_chain_data ${1}${chosen_path}    
+    ventoy_debug_pause
+    

     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}
         boot
     else
         echo "chain empty failed"
     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}
         boot
     else
         echo "chain empty failed"

-        sleep 5
+        ventoy_pause

     fi
 }
 
 function uefi_linux_menu_func {
     if [ "$ventoy_compatible" = "NO" ]; then    
     fi
 }
 
 function uefi_linux_menu_func {
     if [ "$ventoy_compatible" = "NO" ]; then    

+        
+        if [ "$ventoy_fs_probe" = "udf" ]; then
+            loopback -d loop            
+            set ventoy_fs_probe=iso9660
+            loopback loop $1$2
+        fi
+        

         vt_load_cpio  ${vtoy_path}/ventoy.cpio   $2 $1
 
         vt_linux_clear_initrd
         vt_load_cpio  ${vtoy_path}/ventoy.cpio   $2 $1
 
         vt_linux_clear_initrd


@@ -166,20 +215,14 @@ function uefi_linux_menu_func {
                 fi
             done
         fi
                 fi
             done
         fi

-        
+

         # special process for special distros
         if [ -d (loop)/loader/entries ]; then
         # special process for special distros
         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_parse_initrd_grub  dir  (loop)/loader/entries/
         elif [ -d (loop)/boot/grub ]; then
             vt_linux_parse_initrd_grub  dir  (loop)/boot/grub/
         fi
         

-        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
         distro_specify_initrd_file
         
         vt_linux_initrd_count vtcount


@@ -194,6 +237,24 @@ function uefi_linux_menu_func {
         fi
         
         locate_initrd
         fi
         
         locate_initrd

+        
+        if [ -d (loop)/loader/entries ]; then
+            vt_linux_get_main_initrd_index vtindex
+            
+            if [ -d (loop)/arch ]; then
+                if [ -f (loop)/arch/boot/x86_64/archiso.img ]; then
+                    vt_add_replace_file $vtindex "EFI\\archiso\\archiso.img"
+                elif [ -f (loop)/boot/initramfs_x86_64.img ]; then
+                    vt_add_replace_file $vtindex "boot\\initramfs_x86_64.img"
+                fi
+            elif [ -f (loop)/EFI/BOOT/initrd.gz ]; then
+                vt_add_replace_file $vtindex "EFI\\BOOT\\initrd.gz"
+            fi
+        elif [ -e (loop)/syslinux/alt0/full.cz ]; then
+            vt_add_replace_file 0 "EFI\\BOOT\\full.cz"            
+            set FirstTryBootFile='@EFI@BOOT@grubx64.efi'
+        fi
+        

     fi
     
     vt_linux_chain_data ${1}${chosen_path}
     fi
     
     vt_linux_chain_data ${1}${chosen_path}


@@ -204,7 +265,7 @@ function uefi_linux_menu_func {
         boot
     else
         echo "chain empty failed"
         boot
     else
         echo "chain empty failed"

-        sleep 5
+        ventoy_pause

     fi
 }
 
     fi
 }
 


@@ -232,6 +293,7 @@ function uefi_iso_menu_func {
         set ventoy_fs_probe=udf
     else
         set ventoy_fs_probe=iso9660
         set ventoy_fs_probe=udf
     else
         set ventoy_fs_probe=iso9660

+        vt_iso9660_nojoliet 0

     fi
 
     loopback loop ${1}${chosen_path}
     fi
 
     loopback loop ${1}${chosen_path}


@@ -257,13 +319,7 @@ function uefi_iso_menu_func {
     vt_img_sector ${1}${chosen_path}
     
     if [ "$vtoy_os" = "Windows" ]; then
     vt_img_sector ${1}${chosen_path}
     
     if [ "$vtoy_os" = "Windows" ]; then

-        vt_check_pe (loop)        
-        if [ "$VT_PE_SUPPORT" != "YES" ]; then
-            if [ "$ventoy_fs_probe" = "iso9660" ]; then        
-                set ventoy_compatible=YES
-            fi
-        fi
-    
+        vt_check_compatible_pe (loop)        

         uefi_windows_menu_func  $1 ${chosen_path}
     else
         uefi_linux_menu_func  $1 ${chosen_path}
         uefi_windows_menu_func  $1 ${chosen_path}
     else
         uefi_linux_menu_func  $1 ${chosen_path}


@@ -287,32 +343,50 @@ function uefi_iso_memdisk {
 function legacy_windows_menu_func {
     vt_windows_reset
     
 function legacy_windows_menu_func {
     vt_windows_reset
     

-    if [ "$ventoy_compatible" = "NO" ]; then                
-        find_wim_file (loop)
-        if [ -n "$ventoy_wim_file" ]; then
-            vt_windows_locate_wim $ventoy_wim_file
-        elif [ -n "${vtdebug_flag}" ]; then
-            echo No wim file found
+    if [ "$ventoy_compatible" = "NO" ]; then   
+        
+        if [ "$ventoy_fs_probe" = "iso9660" ]; then
+            loopback -d loop
+            vt_iso9660_nojoliet 1
+            loopback loop $1$2

         fi
         fi

+        
+        for file in "boot/bcd" "/efi/microsoft/boot/bcd" "SSTR/BCD"; do
+            vt_windows_collect_wim_patch bcd (loop)/$file                
+        done
+        
+        distro_specify_wim_patch
+
+        vt_windows_count_wim_patch vt_wim_cnt
+        if [ $vt_wim_cnt -eq 0 ]; then
+            distro_specify_wim_patch_phase2
+        fi
+        
+        ventoy_debug_pause        
+        locate_wim

     fi
     fi

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

     
     if [ -n "$vtoy_chain_mem_addr" ]; then
         linux16   $vtoy_path/ipxe.krn ${vtdebug_flag} ibft mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
         boot
     else
         echo "chain empty failed"
     
     if [ -n "$vtoy_chain_mem_addr" ]; then
         linux16   $vtoy_path/ipxe.krn ${vtdebug_flag} ibft mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
         boot
     else
         echo "chain empty failed"

-        sleep 5
+        ventoy_pause

     fi
 }
 
 function legacy_linux_menu_func {
     if [ "$ventoy_compatible" = "NO" ]; then
     fi
 }
 
 function legacy_linux_menu_func {
     if [ "$ventoy_compatible" = "NO" ]; then

+
+        if [ "$ventoy_fs_probe" = "udf" ]; then
+            loopback -d loop
+            set ventoy_fs_probe=iso9660
+            loopback loop $1$2
+        fi
+    

         vt_load_cpio  $vtoy_path/ventoy.cpio  $2 $1
 
         vt_linux_clear_initrd
         vt_load_cpio  $vtoy_path/ventoy.cpio  $2 $1
 
         vt_linux_clear_initrd


@@ -352,18 +426,15 @@ function legacy_linux_menu_func {
         locate_initrd
     fi
     
         locate_initrd
     fi
     

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

     
     if [ -n "$vtoy_chain_mem_addr" ]; then
         linux16   $vtoy_path/ipxe.krn ${vtdebug_flag}  mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
         boot
     else
         echo "chain empty failed"
     
     if [ -n "$vtoy_chain_mem_addr" ]; then
         linux16   $vtoy_path/ipxe.krn ${vtdebug_flag}  mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
         boot
     else
         echo "chain empty failed"

-        sleep 5
+        ventoy_pause

     fi
 }
 
     fi
 }
 


@@ -381,12 +452,12 @@ function legacy_iso_menu_func {
         set ventoy_fs_probe=udf
     else
         set ventoy_fs_probe=iso9660
         set ventoy_fs_probe=udf
     else
         set ventoy_fs_probe=iso9660

-    fi   
-
-    loopback loop ${1}${chosen_path}
+        vt_iso9660_nojoliet 0
+    fi

     
     

+    loopback loop ${1}${chosen_path}

     get_os_type (loop)
     get_os_type (loop)

-    
+

     if [ -n "$vtcompat" ]; then
         set ventoy_compatible=YES
         unset vtcompat
     if [ -n "$vtcompat" ]; then
         set ventoy_compatible=YES
         unset vtcompat


@@ -399,13 +470,7 @@ function legacy_iso_menu_func {
     vt_img_sector ${1}${chosen_path}
 
     if [ "$vtoy_os" = "Windows" ]; then
     vt_img_sector ${1}${chosen_path}
 
     if [ "$vtoy_os" = "Windows" ]; then

-        vt_check_pe (loop)        
-        if [ "$VT_PE_SUPPORT" != "YES" ]; then
-            if [ "$ventoy_fs_probe" = "iso9660" ]; then        
-                set ventoy_compatible=YES
-            fi
-        fi
-        
+        vt_check_compatible_pe (loop)        

         legacy_windows_menu_func  $1 ${chosen_path}
     else
         legacy_linux_menu_func  $1 ${chosen_path}
         legacy_windows_menu_func  $1 ${chosen_path}
     else
         legacy_linux_menu_func  $1 ${chosen_path}


@@ -446,10 +511,9 @@ function iso_unsupport_menuentry {
 
 function wim_common_menuentry {
     vt_chosen_img_path chosen_path
 
 function wim_common_menuentry {
     vt_chosen_img_path chosen_path

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

     
     if [ -n "$vtoy_chain_mem_addr" ]; then
         if [ "$grub_platform" = "pc" ]; then
     
     if [ -n "$vtoy_chain_mem_addr" ]; then
         if [ "$grub_platform" = "pc" ]; then


@@ -461,7 +525,7 @@ function wim_common_menuentry {
         boot
     else
         echo "chain empty failed"
         boot
     else
         echo "chain empty failed"

-        sleep 5
+        ventoy_pause

     fi
 }
 
     fi
 }
 


@@ -479,7 +543,7 @@ function wim_unsupport_menuentry {
 #############################################################
 #############################################################
 
 #############################################################
 #############################################################
 

-set VENTOY_VERSION="1.0.12"
+set VENTOY_VERSION="1.0.13"

 
 # Default menu display mode, you can change it as you want.
 #    0: List mode   
 
 # Default menu display mode, you can change it as you want.
 #    0: List mode   


@@ -490,10 +554,12 @@ set VTOY_DEFAULT_MENU_MODE=0
 unset timeout
 
 set VTOY_MEM_DISK_STR="[Memdisk]"
 unset timeout
 
 set VTOY_MEM_DISK_STR="[Memdisk]"

-set VTOY_ISO_RAW_STR="ISO RAW"
+set VTOY_ISO_RAW_STR="Compatible Mode"

 set VTOY_ISO_UEFI_DRV_STR="UEFI FS"
 
 set VTOY_F2_CMD="ventoy_power"
 set VTOY_ISO_UEFI_DRV_STR="UEFI FS"
 
 set VTOY_F2_CMD="ventoy_power"

+set VTOY_F4_CMD="ventoy_localboot"
+set VTOY_F5_CMD="ventoy_diagnosis"

 
 if [ "$grub_platform" = "pc" ]; then
     set VTOY_TEXT_MENU_VER="Ventoy $VENTOY_VERSION BIOS  www.ventoy.net"
 
 if [ "$grub_platform" = "pc" ]; then
     set VTOY_TEXT_MENU_VER="Ventoy $VENTOY_VERSION BIOS  www.ventoy.net"


@@ -504,7 +570,7 @@ fi
 vt_device $root  vtoy_dev
 
 if [ "$vtoy_dev" = "tftp" ]; then
 vt_device $root  vtoy_dev
 
 if [ "$vtoy_dev" = "tftp" ]; then

-    set vtoy_path=($root)    
+    set vtoy_path=($root)

     for vtid in 0 1 2 3; do
         if [ -d (hd$vtid,2)/ventoy ]; then
             set iso_path=(hd$vtid,1)
     for vtid in 0 1 2 3; do
         if [ -d (hd$vtid,2)/ventoy ]; then
             set iso_path=(hd$vtid,1)


@@ -512,13 +578,19 @@ if [ "$vtoy_dev" = "tftp" ]; then
             break
         fi
     done
             break
         fi
     done

+    loadfont ascii

 else
 else

-    set vtoy_path=($root)/ventoy    
+    if [ "$prefix" = "(ventoydisk)/grub" ]; then
+        set vtoy_path=(ventoydisk)/ventoy
+    else
+        set vtoy_path=($root)/ventoy
+    fi
+

     set iso_path=($vtoy_dev,1)
     set vtoy_efi_part=($vtoy_dev,2)
     set iso_path=($vtoy_dev,1)
     set vtoy_efi_part=($vtoy_dev,2)

+    loadfont unicode

 fi
 
 fi
 

-loadfont ascii

 
 #Load Plugin
 if [ -f $iso_path/ventoy/ventoy.json ]; then
 
 #Load Plugin
 if [ -f $iso_path/ventoy/ventoy.json ]; then


@@ -534,10 +606,10 @@ fi
 
 if [ $VTOY_DEFAULT_MENU_MODE -eq 0 ]; then
     set VTOY_F3_CMD="vt_dynamic_menu 1 1"
 
 if [ $VTOY_DEFAULT_MENU_MODE -eq 0 ]; then
     set VTOY_F3_CMD="vt_dynamic_menu 1 1"

-    set VTOY_HOTKEY_TIP="F1:Memdisk  F2:Power  F3:TreeView"
+    set VTOY_HOTKEY_TIP="F1:Memdisk  F2:Power  F3:TreeView  F4:Localboot  F5:Debug"

 else
     set VTOY_F3_CMD="vt_dynamic_menu 1 0"
 else
     set VTOY_F3_CMD="vt_dynamic_menu 1 0"

-    set VTOY_HOTKEY_TIP="F1:Memdisk  F2:Power  F3:ListView"
+    set VTOY_HOTKEY_TIP="F1:Memdisk  F2:Power  F3:ListView  F4:Localboot  F5:Debug"

 fi
 
 
 fi
 
 


@@ -553,7 +625,13 @@ else
     set theme=$prefix/themes/ventoy/theme.txt
 fi
 
     set theme=$prefix/themes/ventoy/theme.txt
 fi
 

-terminal_output  gfxterm
+if [ "$vtoy_display_mode" = "CLI" ]; then
+    terminal_output  console
+else
+    terminal_output  gfxterm
+fi
+
+#vtdebug on

 
 #colect all image files (iso files)
 set ventoy_img_count=0
 
 #colect all image files (iso files)
 set ventoy_img_count=0