1.0.33 release

diff --git a/IMG/cpio/ventoy/hook/debian/360-disk.sh b/IMG/cpio/ventoy/hook/debian/360-disk.sh
deleted file mode 100644 (file)
index b40aec3..0000000
--- a/IMG/cpio/ventoy/hook/debian/360-disk.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/ventoy/busybox/sh
-#************************************************************************************
-# Copyright (c) 2020, longpanda <admin@ventoy.net>
-# 
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 3 of the
-# License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
-# 
-#************************************************************************************
-
-. /ventoy/hook/ventoy-hook-lib.sh
-
-if is_ventoy_hook_finished; then
-    exit 0
-fi
-
-vtlog "####### $0 $* ########"
-
-VTPATH_OLD=$PATH; PATH=$BUSYBOX_PATH:$VTOY_PATH/tool:$PATH
-
-wait_for_usb_disk_ready
-
-vtdiskname=$(get_ventoy_disk_name)
-if [ "$vtdiskname" = "unknown" ]; then
-    vtlog "ventoy disk not found"
-    PATH=$VTPATH_OLD
-    exit 0
-fi
-
-vtlog "fuse $*"
-
-mkdir -p $VTOY_PATH/mnt/fuse $VTOY_PATH/mnt/iso
-
-vtoydm -p -f $VTOY_PATH/ventoy_image_map -d $vtdiskname > $VTOY_PATH/ventoy_dm_table
-vtoy_fuse_iso -f $VTOY_PATH/ventoy_dm_table -m $VTOY_PATH/mnt/fuse
-
-mount -t iso9660  $VTOY_PATH/mnt/fuse/ventoy.iso    $VTOY_PATH/mnt/iso
-
-rm -f /puppy.sfs
-echo -e "\n\\033[1;35mCopying to ram ...\\033[0;39m" > /dev/console
-[ -d $VTOY_PATH/mnt/iso/360Disk ] && cp -a $VTOY_PATH/mnt/iso/360Disk  $VTOY_PATH/
-[ -e $VTOY_PATH/360Disk/puppy.sfs ] && mv $VTOY_PATH/360Disk/puppy.sfs   /puppy.sfs
-
-umount $VTOY_PATH/mnt/iso
-umount $VTOY_PATH/mnt/fuse
-
-PATH=$VTPATH_OLD
-
-set_ventoy_hook_finish

diff --git a/IMG/cpio/ventoy/hook/debian/360-switch-root.sh b/IMG/cpio/ventoy/hook/debian/360-switch-root.sh
deleted file mode 100644 (file)
index 63da14d..0000000
--- a/IMG/cpio/ventoy/hook/debian/360-switch-root.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/ventoy/busybox/sh
-#************************************************************************************
-# Copyright (c) 2020, longpanda <admin@ventoy.net>
-# 
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 3 of the
-# License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
-# 
-#************************************************************************************
-
-. /ventoy/hook/ventoy-hook-lib.sh
-
-VTPATH_OLD=$PATH; PATH=$BUSYBOX_PATH:$VTOY_PATH/tool:$PATH
-
-mkdir -p /pup_new/mnt/sdz
-mv $VTOY_PATH/360Disk /pup_new/mnt/sdz/
-[ -f /pup_new/root/scripts/cd_plugin ] && echo "/root/scripts/cd_plugin sdz" >> /pup_new/etc/rc.d/rc.local
-
-PATH=$VTPATH_OLD
-

diff --git a/IMG/cpio/ventoy/hook/debian/puppy-hook.sh b/IMG/cpio/ventoy/hook/debian/puppy-hook.sh
index 037c77adb6ea4a5fd729f7e589d701ee60a32855..cbb5a20ba5b72f8a0c063470a15fe2f532cac91b 100644 (file)
--- a/IMG/cpio/ventoy/hook/debian/puppy-hook.sh
+++ b/IMG/cpio/ventoy/hook/debian/puppy-hook.sh
@@ -17,18 +17,9 @@
 # 
 #************************************************************************************
 
 # 
 #************************************************************************************
 

-if $GREP -q '^ *HAVE_PARTS=' /init; then
-    $SED '1 apmedia=usbhd'  -i /init
-    $SED "/^ *HAVE_PARTS=/a\ $BUSYBOX_PATH/sh $VTOY_PATH/hook/debian/puppy-disk.sh"  -i /init
-    $SED "/^ *HAVE_PARTS=/a\ HAVE_PARTS='ventoy|iso9660'"  -i /init
-fi
-
-#360UDisk
-if [ -e /360anim ]; then    
-    $BUSYBOX_PATH/touch /puppy.sfs 
-    $SED "/if *.*flag-usb-ready/i\ $BUSYBOX_PATH/sh $VTOY_PATH/hook/debian/360-disk.sh"  -i /init
-    $SED "/^exec *switch_root/i\ $BUSYBOX_PATH/sh $VTOY_PATH/hook/debian/360-switch-root.sh"  -i /init    
-fi
+$SED '1 apmedia=usbhd'  -i /init
+$SED "/^ *HAVE_PARTS=/a\ $BUSYBOX_PATH/sh $VTOY_PATH/hook/debian/puppy-disk.sh"  -i /init
+$SED "/^ *HAVE_PARTS=/a\ HAVE_PARTS='ventoy|iso9660'"  -i /init

 
 if [ -f /DISTRO_SPECS ]; then
     if ! [ -d /dev ]; then
 
 if [ -f /DISTRO_SPECS ]; then
     if ! [ -d /dev ]; then

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index 8cb8fe069f96eebad8fe666ac8bc82a3077c68c6..3bda6d73a87c9020aad3251b3ed091519dd4fbd0 100644 (file)
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -622,6 +622,12 @@ function uefi_linux_menu_func {
     
     vt_linux_chain_data "${1}${chosen_path}"
 
     
     vt_linux_chain_data "${1}${chosen_path}"
 

+    if [ -n "$LoadIsoEfiDriver" -a $vt_chosen_size -lt 104857600 ]; then
+        if [ -f (loop)/efi/clover/cloverx64.efi ]; then
+            unset LoadIsoEfiDriver
+        fi
+    fi
+

     if [ -n "$vtoy_chain_mem_addr" ]; then
         ventoy_acpi_param ${vtoy_chain_mem_addr} 2048
         ventoy_cli_console       
     if [ -n "$vtoy_chain_mem_addr" ]; then
         ventoy_acpi_param ${vtoy_chain_mem_addr} 2048
         ventoy_cli_console       


@@ -946,7 +952,9 @@ function ventoy_iso_busybox_ver {
             set ventoy_busybox_ver=64
         elif vt_str_begin "$vt_volume_id" "smgl-test-quinq-x86_64"; then
             set ventoy_busybox_ver=64
             set ventoy_busybox_ver=64
         elif vt_str_begin "$vt_volume_id" "smgl-test-quinq-x86_64"; then
             set ventoy_busybox_ver=64

-            
+        elif vt_str_begin "$vt_volume_id" "LDiagBootable"; then
+            set ventoy_busybox_ver=64
+

         fi
     fi
 }
         fi
     fi
 }


@@ -1476,7 +1484,7 @@ function img_unsupport_menuentry {
 #############################################################
 #############################################################
 
 #############################################################
 #############################################################
 

-set VENTOY_VERSION="1.0.32"
+set VENTOY_VERSION="1.0.33"

 
 #ACPI not compatible with Window7/8, so disable by default
 set VTOY_PARAM_NO_ACPI=1
 
 #ACPI not compatible with Window7/8, so disable by default
 set VTOY_PARAM_NO_ACPI=1

diff --git a/INSTALL/ventoy/ventoy.cpio b/INSTALL/ventoy/ventoy.cpio
index d3df1f028dce599f3569443f76a7e97b5d3992d6..d6067b0262484c4c9f2f1b757ea52f67c96c2b96 100644 (file)
Binary files a/INSTALL/ventoy/ventoy.cpio and b/INSTALL/ventoy/ventoy.cpio differ

diff --git a/INSTALL/ventoy/vtloopex.cpio b/INSTALL/ventoy/vtloopex.cpio
index bbb61ba2d0d8791299c95fda56fa0f7056335406..ad86a6ea24d560b63ec4ea84c24a171f794c7f74 100644 (file)
Binary files a/INSTALL/ventoy/vtloopex.cpio and b/INSTALL/ventoy/vtloopex.cpio differ

diff --git a/README.md b/README.md
index 0227081dda6356fad6ffe1109cf67c647b0003ca..690c51823cc804afca454117d9e0d890f787e75e 100644 (file)
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ You can copy many image files at a time and ventoy will give you a boot menu to
 x86 Legacy BIOS, IA32 UEFI, x86_64 UEFI and ARM64 UEFI are supported in the same way.<br/>
 Both MBR and GPT partition style are supported in the same way.<br/>
 Most type of OS supported(Windows/WinPE/Linux/Unix/Vmware/Xen...) <br/>
 x86 Legacy BIOS, IA32 UEFI, x86_64 UEFI and ARM64 UEFI are supported in the same way.<br/>
 Both MBR and GPT partition style are supported in the same way.<br/>
 Most type of OS supported(Windows/WinPE/Linux/Unix/Vmware/Xen...) <br/>

-600+ ISO files are tested. 90%+ distros in distrowatch.com supported. <br/>
+610+ ISO files are tested. 90%+ distros in distrowatch.com supported. <br/>

 </h4>
 
 # Features
 </h4>
 
 # Features


@@ -35,7 +35,7 @@ Most type of OS supported(Windows/WinPE/Linux/Unix/Vmware/Xen...) <br/>
 * FAT32/exFAT/NTFS/UDF/XFS/Ext2(3)(4) supported for main partition
 * ISO files larger than 4GB supported
 * Native boot menu style for Legacy & UEFI
 * FAT32/exFAT/NTFS/UDF/XFS/Ext2(3)(4) supported for main partition
 * ISO files larger than 4GB supported
 * Native boot menu style for Legacy & UEFI

-* Most type of OS supported, 600+ iso files tested
+* Most type of OS supported, 610+ iso files tested

 * Linux vDisk boot supported
 * Not only boot but also complete installation process
 * Menu dynamically switchable between List/TreeView mode
 * Linux vDisk boot supported
 * Not only boot but also complete installation process
 * Menu dynamically switchable between List/TreeView mode