From ed6c5d85e5daaeb4bfcd1956432ab093eecab86b Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 21 Jun 2022 16:19:30 +0200
Subject: [speedcheck] Support passing rid via file:rid for dnbd3 case

---
 core/modules/speedcheck/data/opt/openslx/bin/image_speedcheck | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'core/modules')

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
-- 
cgit v1.2.3-55-g7522