Optimization for slax-9.11.0 (#725)

diff --git a/IMG/cpio/ventoy/hook/debian/slax-disk.sh b/IMG/cpio/ventoy/hook/debian/slax-disk.sh
index 0e0cbfb96b66ebeaf2602980bcd82d5db68c870f..f38c24bab304579e56b5ccd8cd699bd95cf32049 100644 (file)
--- a/IMG/cpio/ventoy/hook/debian/slax-disk.sh
+++ b/IMG/cpio/ventoy/hook/debian/slax-disk.sh
@@ -60,8 +60,6 @@ ventoy_os_install_dmsetup() {
     fi
 }
 
     fi
 }
 

-wait_for_usb_disk_ready
-

 vtdiskname=$(get_ventoy_disk_name)
 if [ "$vtdiskname" = "unknown" ]; then
     vtlog "ventoy disk not found"
 vtdiskname=$(get_ventoy_disk_name)
 if [ "$vtdiskname" = "unknown" ]; then
     vtlog "ventoy disk not found"


@@ -69,6 +67,14 @@ if [ "$vtdiskname" = "unknown" ]; then
     exit 0
 fi
 
     exit 0
 fi
 

+if check_usb_disk_ready "$vtdiskname"; then
+    vtlog "check_usb_disk_ready ok"
+else
+    vtlog "check_usb_disk_ready error"
+    PATH=$VTPATH_OLD
+    exit 0
+fi
+

 ventoy_os_install_dmsetup $vtdiskname
 
 ventoy_udev_disk_common_hook "${vtdiskname#/dev/}2" "noreplace"
 ventoy_os_install_dmsetup $vtdiskname
 
 ventoy_udev_disk_common_hook "${vtdiskname#/dev/}2" "noreplace"

diff --git a/IMG/cpio/ventoy/hook/debian/slax-hook.sh b/IMG/cpio/ventoy/hook/debian/slax-hook.sh
index 93790fa8d976e145340375164bf42c60158655fe..5663c0ee38e7bc6baf785caf7843fdf914d675d5 100644 (file)
--- a/IMG/cpio/ventoy/hook/debian/slax-hook.sh
+++ b/IMG/cpio/ventoy/hook/debian/slax-hook.sh
@@ -17,4 +17,8 @@
 # 
 #************************************************************************************
 
 # 
 #************************************************************************************
 

-$SED "/find_data/i\ $BUSYBOX_PATH/sh $VTOY_PATH/hook/debian/slax-disk.sh"  -i /init
+if [ -f /lib/livekitlib ] && $GREP -q 'debug_log.*find_data_try' /lib/livekitlib; then
+    $SED "/debug_log.*find_data_try/a\ $BUSYBOX_PATH/sh $VTOY_PATH/hook/debian/slax-disk.sh"  -i /lib/livekitlib
+else
+    $SED "/find_data/i\ $BUSYBOX_PATH/sh $VTOY_PATH/hook/debian/slax-disk.sh"  -i /init
+fi