diff options
| author | Simon Rettberg | 2022-06-21 16:19:30 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2022-06-21 16:19:30 +0200 |
| commit | ed6c5d85e5daaeb4bfcd1956432ab093eecab86b (patch) | |
| tree | 5202545cd99e87b483bf563f4d86fb58fa1b4aae /core/modules/speedcheck/data | |
| parent | [dnbd3-proxy-mode] Force sparse mode for < 200GB ID45 partition (diff) | |
| download | mltk-ed6c5d85e5daaeb4bfcd1956432ab093eecab86b.tar.gz mltk-ed6c5d85e5daaeb4bfcd1956432ab093eecab86b.tar.xz mltk-ed6c5d85e5daaeb4bfcd1956432ab093eecab86b.zip | |
[speedcheck] Support passing rid via file:rid for dnbd3 case
Diffstat (limited to 'core/modules/speedcheck/data')
| -rwxr-xr-x | core/modules/speedcheck/data/opt/openslx/bin/image_speedcheck | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/modules/speedcheck/data/opt/openslx/bin/image_speedcheck b/core/modules/speedcheck/data/opt/openslx/bin/image_speedcheck index 9957b2a6..03464f84 100755 --- a/core/modules/speedcheck/data/opt/openslx/bin/image_speedcheck +++ b/core/modules/speedcheck/data/opt/openslx/bin/image_speedcheck @@ -55,7 +55,12 @@ else fi mountpoint="/tmp/speedtest-$$-$RANDOM" mkdir "$mountpoint" - if ! dnbd3-fuse -S -h "$servers" -i "$file" "$mountpoint"; then + rid="${file##*:}" + if [ "$rid" = "$file" ] || ! [ "$rid" -gt 0 ]; then + rid=0 + fi + file="${file%:*}" + if ! dnbd3-fuse -S -h "$servers" -i "$file" -r "$rid" "$mountpoint"; then showmsg "Cannot start dnb3-fuse from $servers" exit 1 fi |