1
0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-11 09:18:25 +03:00

Kill clvmd properly after locking_type 3 tests (using clvmd/singlenode).

This commit is contained in:
Petr Rockai 2011-01-12 16:07:55 +00:00
parent f1e5f9d8d5
commit d2a3f3afa1

View File

@ -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 .