Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
dadigang
Ventoy
Commits
82977d9b
Commit
82977d9b
authored
Feb 18, 2021
by
longpanda
Browse files
add support for nbd device (PR #746)
parent
35417357
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
10 additions
and
8 deletions
+10
-8
IMG/cpio/ventoy/hook/tinycore/ventoy-disk.sh
IMG/cpio/ventoy/hook/tinycore/ventoy-disk.sh
+1
-1
IMG/cpio/ventoy/hook/ventoy-hook-lib.sh
IMG/cpio/ventoy/hook/ventoy-hook-lib.sh
+5
-5
INSTALL/tool/ventoy_lib.sh
INSTALL/tool/ventoy_lib.sh
+2
-0
LiveCD/VTOY/ventoy/ventoy.sh
LiveCD/VTOY/ventoy/ventoy.sh
+1
-1
VtoyTool/vtoydm.c
VtoyTool/vtoydm.c
+1
-1
VtoyTool/vtoytool/00/vtoytool_32
VtoyTool/vtoytool/00/vtoytool_32
+0
-0
VtoyTool/vtoytool/00/vtoytool_64
VtoyTool/vtoytool/00/vtoytool_64
+0
-0
VtoyTool/vtoytool/00/vtoytool_aa64
VtoyTool/vtoytool/00/vtoytool_aa64
+0
-0
No files found.
IMG/cpio/ventoy/hook/tinycore/ventoy-disk.sh
View file @
82977d9b
...
@@ -36,7 +36,7 @@ if [ "$vtdiskname" = "unknown" ]; then
...
@@ -36,7 +36,7 @@ if [ "$vtdiskname" = "unknown" ]; then
exit
0
exit
0
fi
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"
vPart
=
"
${
vtdiskname
}
p2"
else
else
vPart
=
"
${
vtdiskname
}
2"
vPart
=
"
${
vtdiskname
}
2"
...
...
IMG/cpio/ventoy/hook/ventoy-hook-lib.sh
View file @
82977d9b
...
@@ -87,7 +87,7 @@ wait_for_usb_disk_ready() {
...
@@ -87,7 +87,7 @@ wait_for_usb_disk_ready() {
usb_disk
=
$(
get_ventoy_disk_name
)
usb_disk
=
$(
get_ventoy_disk_name
)
vtlog
"wait_for_usb_disk_ready
$usb_disk
..."
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
vtpart2
=
${
usb_disk
}
p2
else
else
vtpart2
=
${
usb_disk
}
2
vtpart2
=
${
usb_disk
}
2
...
@@ -103,7 +103,7 @@ wait_for_usb_disk_ready() {
...
@@ -103,7 +103,7 @@ wait_for_usb_disk_ready() {
}
}
check_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
vtpart2
=
${
1
}
p2
else
else
vtpart2
=
${
1
}
2
vtpart2
=
${
1
}
2
...
@@ -121,7 +121,7 @@ is_ventoy_disk() {
...
@@ -121,7 +121,7 @@ is_ventoy_disk() {
}
}
not_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
}
vtDiskName
=
${
1
:0:-1
}
else
else
vtDiskName
=
$1
vtDiskName
=
$1
...
@@ -486,7 +486,7 @@ ventoy_create_persistent_link() {
...
@@ -486,7 +486,7 @@ ventoy_create_persistent_link() {
}
}
ventoy_udev_disk_common_hook
()
{
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
}
"
VTDISK
=
"
${
1
:0:-2
}
"
else
else
VTDISK
=
"
${
1
:0:-1
}
"
VTDISK
=
"
${
1
:0:-1
}
"
...
@@ -558,7 +558,7 @@ is_inotify_ventoy_part() {
...
@@ -558,7 +558,7 @@ is_inotify_ventoy_part() {
if
echo
$1
|
$GREP
-q
"2$"
;
then
if
echo
$1
|
$GREP
-q
"2$"
;
then
if
!
[
-e
/sys/block/
$1
]
;
then
if
!
[
-e
/sys/block/
$1
]
;
then
if
[
-e
/sys/class/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
}
vtShortName
=
${
1
:0:-2
}
else
else
vtShortName
=
${
1
:0:-1
}
vtShortName
=
${
1
:0:-1
}
...
...
INSTALL/tool/ventoy_lib.sh
View file @
82977d9b
...
@@ -90,6 +90,8 @@ get_disk_part_name() {
...
@@ -90,6 +90,8 @@ get_disk_part_name() {
echo
${
DISK
}
p
${
2
}
echo
${
DISK
}
p
${
2
}
elif
echo
$DISK
|
grep
-q
"/dev/mmcblk[0-9]"
;
then
elif
echo
$DISK
|
grep
-q
"/dev/mmcblk[0-9]"
;
then
echo
${
DISK
}
p
${
2
}
echo
${
DISK
}
p
${
2
}
elif
echo
$DISK
|
grep
-q
"/dev/nbd[0-9]"
;
then
echo
${
DISK
}
p
${
2
}
else
else
echo
${
DISK
}${
2
}
echo
${
DISK
}${
2
}
fi
fi
...
...
LiveCD/VTOY/ventoy/ventoy.sh
View file @
82977d9b
...
@@ -20,7 +20,7 @@ get_disk_size() {
...
@@ -20,7 +20,7 @@ get_disk_size() {
enum_disk
()
{
enum_disk
()
{
id
=
1
id
=
1
rm
-f
/device.list
rm
-f
/device.list
ls
/sys/block/ | egrep
'd[a-z]|nvme|mmc'
|
while
read
dev
;
do
ls
/sys/block/ | egrep
'd[a-z]|nvme|mmc
|nbd
'
|
while
read
dev
;
do
if
!
[
-b
/dev/
$dev
]
;
then
if
!
[
-b
/dev/
$dev
]
;
then
continue
continue
fi
fi
...
...
VtoyTool/vtoydm.c
View file @
82977d9b
...
@@ -507,7 +507,7 @@ static int vtoydm_print_linear_table(const char *img_map_file, const char *diskn
...
@@ -507,7 +507,7 @@ static int vtoydm_print_linear_table(const char *img_map_file, const char *diskn
(sector_start << 2), disk_sector_num,
(sector_start << 2), disk_sector_num,
diskname, (unsigned long long)chunk[i].disk_start_sector);
diskname, (unsigned long long)chunk[i].disk_start_sector);
#else
#else
if
(
strstr
(
diskname
,
"nvme"
)
||
strstr
(
diskname
,
"mmc"
))
if
(
strstr
(
diskname
,
"nvme"
)
||
strstr
(
diskname
,
"mmc"
)
||
strstr
(
diskname
,
"nbd"
)
)
{
{
printf
(
"%u %u linear %sp1 %llu
\n
"
,
printf
(
"%u %u linear %sp1 %llu
\n
"
,
(
sector_start
<<
2
),
disk_sector_num
,
(
sector_start
<<
2
),
disk_sector_num
,
...
...
VtoyTool/vtoytool/00/vtoytool_32
View file @
82977d9b
No preview for this file type
VtoyTool/vtoytool/00/vtoytool_64
View file @
82977d9b
No preview for this file type
VtoyTool/vtoytool/00/vtoytool_aa64
View file @
82977d9b
No preview for this file type
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment