X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/cd4a5fcb0685b8a12915d22efc5c1e0cc8b40d9b..f028a6f89c0c2ba0e7f5ec6c74ee09bb7454abbb:/INSTALL/grub/grub.cfg

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index 9265704..be1697a 100644
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -16,6 +16,26 @@
 # 
 #************************************************************************************
 
+function ventoy_power {
+    echo '<1>  Reboot'
+    echo '<2>  Halt'
+    echo '<0>  Return to menu'
+    echo -e '\nPlease enter your choice:'
+    
+    unset vtOpt
+    read vtOpt
+    
+    if [ "$vtOpt" = "1" ]; then
+        echo -e '\n\nSystem is rebooting ... \n'
+        sleep 1
+        reboot
+    elif [ "$vtOpt" = "2" ]; then
+        echo -e '\n\nSystem is halting ... \n'
+        sleep 1
+        halt
+    fi
+}
+
 function get_os_type {
     set vtoy_os=Linux    
     for file in "efi/microsoft" "sources/boot.wim" "boot/bcd" "bootmgr.efi" "boot/etfsboot.com"; do
@@ -74,6 +94,23 @@ function distro_specify_initrd_file {
         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
+    elif [ -f (loop)/Setup/initrd.gz ]; then
+        vt_linux_specify_initrd_file /Setup/initrd.gz
+        
     fi
 }
 
@@ -127,8 +164,24 @@ function uefi_linux_menu_func {
             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
+        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
     fi
     
@@ -136,7 +189,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"
@@ -154,7 +207,7 @@ function uefi_iso_menu_func {
     if [ -n "$vtisouefi" ]; then
         set LoadIsoEfiDriver=on
         unset vtisouefi
-    elif [ -n "$VTOY_ISO_UEFI_DRV" ]; then
+    elif vt_check_mode 2; then
         set LoadIsoEfiDriver=on
     else
         unset LoadIsoEfiDriver
@@ -171,10 +224,18 @@ 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
-    elif [ -n "$VTOY_ISO_RAW" ]; then
+    elif vt_check_mode 1; then
         set ventoy_compatible=YES
     else
         vt_check_compatible (loop)
@@ -185,6 +246,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
@@ -207,9 +270,6 @@ function uefi_iso_memdisk {
 }
 
 
-
-
-
 function legacy_windows_menu_func {
     vt_windows_reset
     
@@ -272,6 +332,11 @@ function legacy_linux_menu_func {
         
         distro_specify_initrd_file
         
+        vt_linux_initrd_count vtcount
+        if [ $vtcount -eq 0 ]; then
+            distro_specify_initrd_file_phase2
+        fi
+        
         locate_initrd
     fi
     
@@ -312,7 +377,7 @@ function legacy_iso_menu_func {
     if [ -n "$vtcompat" ]; then
         set ventoy_compatible=YES
         unset vtcompat
-    elif [ -n "$VTOY_ISO_RAW" ]; then
+    elif vt_check_mode 1; then
         set ventoy_compatible=YES
     else
         vt_check_compatible (loop)
@@ -323,7 +388,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
@@ -339,6 +407,22 @@ function legacy_iso_memdisk {
     boot
 }
 
+function common_menuentry {
+    if [ "$grub_platform" = "pc" ]; then
+        if vt_check_mode 0; then
+            legacy_iso_memdisk $iso_path
+        else
+            legacy_iso_menu_func $iso_path
+        fi
+    else
+        if vt_check_mode 0; then
+            uefi_iso_memdisk $iso_path 
+        else
+            uefi_iso_menu_func $iso_path                
+        fi
+    fi      
+}
+
 
 #############################################################
 #############################################################
@@ -348,7 +432,7 @@ function legacy_iso_memdisk {
 #############################################################
 #############################################################
 
-set VENTOY_VERSION="1.0.05"
+set VENTOY_VERSION="1.0.08"
 
 #disable timeout
 unset timeout
@@ -357,6 +441,16 @@ set VTOY_MEM_DISK_STR="MEMDISK"
 set VTOY_ISO_RAW_STR="ISO RAW"
 set VTOY_ISO_UEFI_DRV_STR="UEFI FS"
 
+set VTOY_F2_CMD="ventoy_power"
+set VTOY_F3_CMD="vt_dynamic_menu tree"
+
+set VTOY_HOTKEY_TIP="F1:Memdisk  F2:Power  F3:TreeView"
+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"
+fi
+
 vt_device $root  vtoy_dev
 
 if [ "$vtoy_dev" = "tftp" ]; then
@@ -378,7 +472,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
@@ -386,43 +484,18 @@ 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
 vt_list_img $iso_path ventoy_img_count
 
-#Dynamic menu for every iso file
-if vt_cmp $ventoy_img_count ne 0; then
-    set imgid=0
-    while vt_cmp $imgid lt $ventoy_img_count; do       
-        vt_img_name $imgid img_name
-        menuentry "$img_name" {  
-            if [ "$grub_platform" = "pc" ]; then
-                if [ -n "$VTOY_MEM_DISK" ]; then
-                    legacy_iso_memdisk $iso_path
-                else
-                    legacy_iso_menu_func $iso_path
-                fi
-            else
-                if [ -n "$VTOY_MEM_DISK" ]; then
-                    uefi_iso_memdisk $iso_path 
-                else
-                    uefi_iso_menu_func $iso_path                
-                fi
-            fi            
-        }
-        
-        vt_incr imgid 1
-    done
+#Main menu
+if [ $ventoy_img_count -gt 0 ]; then
+    vt_dynamic_menu
 else
     menuentry "No ISO files found (Press enter to reboot ...)" {
         echo -e "\n    Rebooting ... "
         reboot
     }
 fi
-