X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/d02f184a8de1a49db423c9539e468941ab565847..78df21fc4053350dbb6f41061dcfeeff9727f4fb:/IMG/cpio/ventoy/hook/ventoy-hook-lib.sh

diff --git a/IMG/cpio/ventoy/hook/ventoy-hook-lib.sh b/IMG/cpio/ventoy/hook/ventoy-hook-lib.sh
index f9dae7a..7a3a982 100644
--- a/IMG/cpio/ventoy/hook/ventoy-hook-lib.sh
+++ b/IMG/cpio/ventoy/hook/ventoy-hook-lib.sh
@@ -87,7 +87,7 @@ wait_for_usb_disk_ready() {
 		usb_disk=$(get_ventoy_disk_name)
         vtlog "wait_for_usb_disk_ready $usb_disk ..."
         
-        if echo $usb_disk | $EGREP -q "nvme|mmc"; then
+        if echo $usb_disk | $EGREP -q "nvme|mmc|nbd"; then
             vtpart2=${usb_disk}p2
         else
             vtpart2=${usb_disk}2
@@ -102,6 +102,16 @@ wait_for_usb_disk_ready() {
 	done
 }
 
+check_usb_disk_ready() {
+    if echo $1 | $EGREP -q "nvme|mmc|nbd"; then
+        vtpart2=${1}p2
+    else
+        vtpart2=${1}2
+    fi
+    
+    [ -e "${vtpart2}" ]
+}
+
 is_ventoy_disk() {
     if $VTOY_PATH/tool/vtoydump -f $VTOY_PATH/ventoy_os_param -c "$1"; then
         $BUSYBOX_PATH/true
@@ -111,7 +121,7 @@ is_ventoy_disk() {
 }
 
 not_ventoy_disk() {
-    if echo $1 | $EGREP -q "nvme.*p$|mmc.*p$"; then
+    if echo $1 | $EGREP -q "nvme.*p$|mmc.*p$|nbd.*p$"; then
         vtDiskName=${1:0:-1}
     else
         vtDiskName=$1
@@ -476,7 +486,7 @@ ventoy_create_persistent_link() {
 }
 
 ventoy_udev_disk_common_hook() {    
-    if echo $1 | $EGREP -q "nvme.*p[0-9]$|mmc.*p[0-9]$"; then
+    if echo $1 | $EGREP -q "nvme.*p[0-9]$|mmc.*p[0-9]$|nbd.*p[0-9]$"; then
         VTDISK="${1:0:-2}"    
     else
         VTDISK="${1:0:-1}"
@@ -548,7 +558,7 @@ is_inotify_ventoy_part() {
     if echo $1 | $GREP -q "2$"; then
         if ! [ -e /sys/block/$1 ]; then
             if [ -e /sys/class/block/$1 ]; then
-                if echo $1 | $EGREP -q "nvme|mmc"; then
+                if echo $1 | $EGREP -q "nvme|mmc|nbd"; then
                     vtShortName=${1:0:-2}
                 else
                     vtShortName=${1:0:-1}