From 04e7644a48857c2bf236b687d1d30855131769fa Mon Sep 17 00:00:00 2001
From: Corentin LABBE <clabbe@baylibre.com>
Date: Fri, 27 Sep 2019 10:43:15 +0200
Subject: lava-slave: handle better board without worker set

---
 lava-slave/scripts/setup.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'lava-slave/scripts')

diff --git a/lava-slave/scripts/setup.sh b/lava-slave/scripts/setup.sh
index 4bf2f67..c39fdc4 100755
--- a/lava-slave/scripts/setup.sh
+++ b/lava-slave/scripts/setup.sh
@@ -105,10 +105,14 @@ do
 		if [ $? -eq 0 ];then
 			echo "$devicename already present"
 			#verify if present on another worker
-			#TODO
-			lavacli $LAVACLIOPTS devices show $devicename |grep ^worker |grep -q $worker
-			if [ $? -ne 0 ];then
-				echo "ERROR: $devicename already present on another worker"
+			lavacli $LAVACLIOPTS devices show $devicename |grep ^worker > /tmp/current-worker
+			if [ $? -ne 0 ]; then
+				CURR_WORKER=""
+			else
+				CURR_WORKER=$(cat /tmp/current-worker | sed '^.* ,,')
+			fi
+			if [ ! -z "$CURR_WORKER" -a "$CURR_WORKER" != "$worker" ];then
+				echo "ERROR: $devicename already present on another worker $CURR_WORKER"
 				exit 1
 			fi
 			DEVICE_HEALTH=$(grep "$devicename[[:space:]]" /tmp/devices.list | sed 's/.*,//')
-- 
cgit 1.2.3-korg