From d2a3f3afa1358c5ae231d37c8a5ac47e48471698 Mon Sep 17 00:00:00 2001
From: Petr Rockai <prokai@redhat.com>
Date: Wed, 12 Jan 2011 16:07:55 +0000
Subject: [PATCH] Kill clvmd properly after locking_type 3 tests (using
 clvmd/singlenode).

---
 test/lib/aux.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/lib/aux.sh b/test/lib/aux.sh
index c4f62ed68..8a09fb5fd 100644
--- a/test/lib/aux.sh
+++ b/test/lib/aux.sh
@@ -32,6 +32,7 @@ prepare_clvmd() {
 	# check that it is really running now
 	sleep .1
 	ps $LOCAL_CLVMD || skip
+        echo "$LOCAL_CLVMD" > LOCAL_CLVMD
 }
 
 prepare_dmeventd() {
@@ -83,10 +84,10 @@ teardown_devs() {
 teardown() {
     echo -n "## teardown..."
 
-    test -n "$LOCAL_CLVMD" && {
-	kill "$LOCAL_CLVMD"
+    test -f LOCAL_CLVMD && {
+	kill "$(cat LOCAL_CLVMD)"
 	sleep .1
-	kill -9 "$LOCAL_CLVMD" || true
+	kill -9 "$(cat LOCAL_CLVMD)" || true
     }
 
     echo -n .
-- 
2.43.5