]> glassweightruler.freedombox.rocks Git - Ventoy.git/commitdiff
1.0.08beta2 v1.0.08beta2
authorlongpanda <admin@ventoy.net>
Mon, 27 Apr 2020 12:44:33 +0000 (20:44 +0800)
committerlongpanda <admin@ventoy.net>
Mon, 27 Apr 2020 12:44:36 +0000 (20:44 +0800)
INSTALL/EFI/BOOT/grubx64_real.efi
INSTALL/grub/grub.cfg
INSTALL/grub/i386-pc/core.img
INSTALL/grub/themes/ventoy/background.png
INSTALL/grub/themes/ventoy/theme.txt
INSTALL/grub/x86_64-efi/normal.mod
INSTALL/ventoy/ventoy.cpio
VtoyTool/vtoytool/00/vtoytool_32
VtoyTool/vtoytool/00/vtoytool_64

index ea294147d727e83bfdc2b1a855ec307eadd534bb..19c0ab098e5b004061df2861e63a5c3ede094ae6 100644 (file)
Binary files a/INSTALL/EFI/BOOT/grubx64_real.efi and b/INSTALL/EFI/BOOT/grubx64_real.efi differ
index 3bf13d138762879f4c8555ff4c38f4c21f6cb6fa..18b9b0502c008b647d0ed273a0b95afbbc67eec9 100644 (file)
 # 
 #************************************************************************************
 
+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
+    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
@@ -395,7 +422,7 @@ function legacy_iso_memdisk {
 #############################################################
 #############################################################
 
-set VENTOY_VERSION="1.0.08b1"
+set VENTOY_VERSION="1.0.08b2"
 
 #disable timeout
 unset timeout
@@ -404,6 +431,9 @@ 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"
+
 vt_device $root  vtoy_dev
 
 if [ "$vtoy_dev" = "tftp" ]; then
index 0033e1ed4d122524ee510934e0293d81fb9ecbb3..3e06b842ef8752912262027a9836aa9d4e57a518 100644 (file)
Binary files a/INSTALL/grub/i386-pc/core.img and b/INSTALL/grub/i386-pc/core.img differ
index 5464b1d7a4fd08103c8073d1752d88bd702946bc..10098dd3ffe4f24b6671d9156a97fde61647b788 100644 (file)
Binary files a/INSTALL/grub/themes/ventoy/background.png and b/INSTALL/grub/themes/ventoy/background.png differ
index dddce556f221f42aea05004f1684ba2848a77574..86f5ec3d2628e51a979efe9844ebea2ba58b6dcf 100644 (file)
@@ -49,6 +49,14 @@ terminal-box: "terminal_box_*.png"
   highlight_style = "*"
 }
 
++ hbox{ 
+    left = 40%
+    top = 95%
+    width = 10%
+    height = 25
+    + label {text = "F1:Memdisk" color = "blue" align = "left"} 
+}
+
 
 + hbox{ 
     left = 90%
index 2a85a503b114d169ac4facb296c9b13a3ecf0586..db224dddad1c74aaa8405216ebd210aae55d3c78 100644 (file)
Binary files a/INSTALL/grub/x86_64-efi/normal.mod and b/INSTALL/grub/x86_64-efi/normal.mod differ
index 30c34e766cf060d5a7c58d43785ffc6dab11fcf3..c181fceca817949ec8a1b909d6306b2d92f4b8f9 100644 (file)
Binary files a/INSTALL/ventoy/ventoy.cpio and b/INSTALL/ventoy/ventoy.cpio differ
index 8ebeaa4b643570b1860bc509acd63c6989710128..d2a0c363746757a481bd54f1fff81cba6924c13f 100644 (file)
Binary files a/VtoyTool/vtoytool/00/vtoytool_32 and b/VtoyTool/vtoytool/00/vtoytool_32 differ
index 0bd3dca2c6ae2966b5c21b382971bb2b3958e4a0..bb9d703f6808603f213465ee8b4d46efd22bf140 100644 (file)
Binary files a/VtoyTool/vtoytool/00/vtoytool_64 and b/VtoyTool/vtoytool/00/vtoytool_64 differ