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

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index 18b9b05..be1697a 100644
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -16,33 +16,26 @@
 # 
 #************************************************************************************
 
-function ventoy_boot_from_hdd {
-    if [ "$grub_platform" = "pc" ]; then
-        if [ "$iso_path" = "(hd0,1)" ]; then
-            if [ -b (hd1) ]; then
-                set root=(hd1)
-                drivemap -s hd0 hd1
-                chainloader +1
-                boot
-            else
-                echo  "No local hdd found ..."
-                sleep 3
-            fi
-        else
-            set root=(hd0)
-            chainloader +1
-            boot
-        fi
-    else
-        exit
+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 ventoy_reboot {
-    reboot
-}
-
-
 function get_os_type {
     set vtoy_os=Linux    
     for file in "efi/microsoft" "sources/boot.wim" "boot/bcd" "bootmgr.efi" "boot/etfsboot.com"; do
@@ -115,6 +108,9 @@ function distro_specify_initrd_file {
 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
 }
 
@@ -211,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
@@ -239,7 +235,7 @@ function uefi_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)
@@ -274,8 +270,6 @@ function uefi_iso_memdisk {
 }
 
 
-
-
 function legacy_windows_menu_func {
     vt_windows_reset
     
@@ -383,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)
@@ -413,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      
+}
+
 
 #############################################################
 #############################################################
@@ -422,7 +432,7 @@ function legacy_iso_memdisk {
 #############################################################
 #############################################################
 
-set VENTOY_VERSION="1.0.08b2"
+set VENTOY_VERSION="1.0.08"
 
 #disable timeout
 unset timeout
@@ -431,8 +441,15 @@ 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_boot_from_hdd"
-set VTOY_F3_CMD="ventoy_reboot"
+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
 
@@ -473,33 +490,12 @@ terminal_output  gfxterm
 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
-