1.0.24 release

diff --git a/IMG/cpio/ventoy/hook/debian/default-hook.sh b/IMG/cpio/ventoy/hook/debian/default-hook.sh
index 4ec2261e0dc0d610a39048357ff61b085afd3848..e9873d82cb69686ce4df4204dbe8020da6ad9958 100644 (file)
--- a/IMG/cpio/ventoy/hook/debian/default-hook.sh
+++ b/IMG/cpio/ventoy/hook/debian/default-hook.sh
@@ -33,12 +33,11 @@ if [ -e /init ] && $GREP -q '^mountroot$' /init; then
     fi
 elif [ -e "$CD_DETECT" ]; then
     echo "$CD_DETECT exist, now add hook in it..." >> $VTLOG
     fi
 elif [ -e "$CD_DETECT" ]; then
     echo "$CD_DETECT exist, now add hook in it..." >> $VTLOG

-

     $SED  "1 a $BUSYBOX_PATH/sh $VTOY_PATH/hook/debian/disk_mount_hook.sh"  -i "$CD_DETECT"
     $SED  "1 a $BUSYBOX_PATH/sh $VTOY_PATH/hook/debian/disk_mount_hook.sh"  -i "$CD_DETECT"

-    TITLE_LINE=$($GREP -m1 '^hw-detect.*detect_progress_title' "$CD_DETECT")
-    if [ $? -eq 0 ]; then
-        echo "add $TITLE_LINE for hook" >> $VTLOG
-        $SED  "1 a$TITLE_LINE"  -i "$CD_DETECT"
+    
+    if [ -e /bin/list-devices ]; then
+        mv /bin/list-devices /bin/list-devices-bk
+        cp -a /ventoy/hook/debian/list-devices /bin/list-devices

     fi
 elif [ -e /init ] && $GREP -q '/start-udev$' /init; then
     echo "Here use notify ..." >> $VTLOG
     fi
 elif [ -e /init ] && $GREP -q '/start-udev$' /init; then
     echo "Here use notify ..." >> $VTLOG

diff --git a/IMG/cpio/ventoy/hook/debian/list-devices b/IMG/cpio/ventoy/hook/debian/list-devices
new file mode 100644 (file)
index 0000000..874bb68
--- /dev/null
+++ b/IMG/cpio/ventoy/hook/debian/list-devices
@@ -0,0 +1,9 @@
+#! /bin/sh
+
+if [ "$1" = "usb-partition" -a -z "$2" ]; then
+    if [ -f /ventoy/list-devices-usb-part ]; then
+        cat /ventoy/list-devices-usb-part
+    fi
+fi
+
+/bin/list-devices-bk $*

diff --git a/IMG/cpio/ventoy/hook/debian/udev_disk_hook.sh b/IMG/cpio/ventoy/hook/debian/udev_disk_hook.sh
index a0f88b1518c661c4edb36ab40d743cabb2d410fd..d6570d86e3111c6638a831a890110c88ada9b76f 100644 (file)
--- a/IMG/cpio/ventoy/hook/debian/udev_disk_hook.sh
+++ b/IMG/cpio/ventoy/hook/debian/udev_disk_hook.sh
@@ -133,15 +133,7 @@ else
         vtlog "boot=, or casper, don't mount"
     else
         vtlog "No boot param, need to mount"
         vtlog "boot=, or casper, don't mount"
     else
         vtlog "No boot param, need to mount"

-        $BUSYBOX_PATH/mkdir /cdrom
-        
-        if [ -b $VTOY_DM_PATH ]; then
-            vtlog "mount $VTOY_DM_PATH ..."
-            $BUSYBOX_PATH/mount -t iso9660 $VTOY_DM_PATH  /cdrom
-        else
-            vtlog "mount /dev/$1 ..."
-            $BUSYBOX_PATH/mount -t iso9660 /dev/$1  /cdrom
-        fi
+        echo /dev/$1 > /ventoy/list-devices-usb-part

     fi
 fi
 
     fi
 fi
 

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index b6fa42ab5328e63bc6b16be2ffa97b8ac5803a25..51a2ee65d605bcc2aa96ccdfcc67bc1d4f4f5998 100644 (file)
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -1044,12 +1044,12 @@ function vtoyboot_common_func {
         ventoy_debug_pause
         
         if [ -n "$vtoy_chain_mem_addr" ]; then  
         ventoy_debug_pause
         
         if [ -n "$vtoy_chain_mem_addr" ]; then  

-            ventoy_acpi_param ${vtoy_chain_mem_addr} 512
-            
-            if [ "$grub_platform" = "pc" ]; then                    
+            if [ "$grub_platform" = "pc" ]; then
+                vt_acpi_param ${vtoy_chain_mem_addr} 512

                 linux16 $vtoy_path/ipxe.krn ${vtdebug_flag}  sector512  mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}   
                 boot
             else
                 linux16 $vtoy_path/ipxe.krn ${vtdebug_flag}  sector512  mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}   
                 boot
             else

+                ventoy_acpi_param ${vtoy_chain_mem_addr} 512

                 ventoy_cli_console
                 chainloader ${vtoy_path}/ventoy_x64.efi sector512 env_param=${ventoy_env_param} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
                 boot
                 ventoy_cli_console
                 chainloader ${vtoy_path}/ventoy_x64.efi sector512 env_param=${ventoy_env_param} ${vtdebug_flag} mem:${vtoy_chain_mem_addr}:size:${vtoy_chain_mem_size}
                 boot


@@ -1344,7 +1344,10 @@ function img_unsupport_menuentry {
 #############################################################
 #############################################################
 
 #############################################################
 #############################################################
 

-set VENTOY_VERSION="1.0.23"
+set VENTOY_VERSION="1.0.24"
+
+#ACPI not compatible with Window7/8, so disable by default
+set VTOY_PARAM_NO_ACPI=1

 
 # 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   

diff --git a/INSTALL/ventoy/ventoy.cpio b/INSTALL/ventoy/ventoy.cpio
index f44108f8aff7216b663aed9960b8f9dcec9cf80b..319d4b86f63313e26cb7dcfbaac0a775521ae070 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 9f66913c1ce7aa67036eacbc9c922008c3810daa..1d73e07b1d3eab058e9b6a1567b6a921552469d4 100644 (file)
Binary files a/INSTALL/ventoy/vtloopex.cpio and b/INSTALL/ventoy/vtloopex.cpio differ