add support for nbd device (PR #746)

This commit is contained in:
longpanda
2021-02-18 09:43:27 +08:00
parent 3541735796
commit 82977d9b8a
8 changed files with 10 additions and 8 deletions

View File

@@ -36,7 +36,7 @@ if [ "$vtdiskname" = "unknown" ]; then
exit 0
fi
if echo $vtdiskname | egrep -q "nvme.*p[0-9]$|mmc.*p[0-9]$"; then
if echo $vtdiskname | egrep -q "nvme.*p[0-9]$|mmc.*p[0-9]$|nbd.*p[0-9]$"; then
vPart="${vtdiskname}p2"
else
vPart="${vtdiskname}2"

View File

@@ -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
@@ -103,7 +103,7 @@ wait_for_usb_disk_ready() {
}
check_usb_disk_ready() {
if echo $1 | $EGREP -q "nvme|mmc"; then
if echo $1 | $EGREP -q "nvme|mmc|nbd"; then
vtpart2=${1}p2
else
vtpart2=${1}2
@@ -121,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
@@ -486,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}"
@@ -558,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}