|
@@ -31,7 +31,7 @@ _cleanup()
|
|
{
|
|
{
|
|
_cleanup_qemu
|
|
_cleanup_qemu
|
|
_cleanup_test_img
|
|
_cleanup_test_img
|
|
- rm -f "$TEST_DIR/nbd"
|
|
|
|
|
|
+ rm -f "$SOCK_DIR/nbd"
|
|
}
|
|
}
|
|
trap "_cleanup; exit \$status" 0 1 2 3 15
|
|
trap "_cleanup; exit \$status" 0 1 2 3 15
|
|
|
|
|
|
@@ -66,7 +66,7 @@ else
|
|
QEMU_COMM_TIMEOUT=1
|
|
QEMU_COMM_TIMEOUT=1
|
|
fi
|
|
fi
|
|
|
|
|
|
-_send_qemu_cmd $h "nbd_server_start unix:$TEST_DIR/nbd" "(qemu)"
|
|
|
|
|
|
+_send_qemu_cmd $h "nbd_server_start unix:$SOCK_DIR/nbd" "(qemu)"
|
|
_send_qemu_cmd $h "nbd_server_add -w drive0" "(qemu)"
|
|
_send_qemu_cmd $h "nbd_server_add -w drive0" "(qemu)"
|
|
_send_qemu_cmd $h "q" "(qemu)"
|
|
_send_qemu_cmd $h "q" "(qemu)"
|
|
|
|
|