From: Mehak Mahajan <mmahajan@nicira.com>
Date: Thu, 2 Aug 2012 06:25:35 +0000 (-0700)
Subject: Create .conf.db.~lock~ in same dir as DBDIR.
X-Git-Tag: sliver-openvswitch-1.8.90-0~48^2~128
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=fda1672c7498e52a7932729278ce363fe4b7e205;p=sliver-openvswitch.git

Create .conf.db.~lock~ in same dir as DBDIR.

Commit f973f2af (Make the location of the database separately configurable.)
introduced the environment variable OVS_DBDIR which specifies the path for
the conf.db.  With this commit, .conf.db.~lock~ will also be created in the
DBDIR.

Signed-off-by: Mehak Mahajan <mmahajan@nicira.com>
---

diff --git a/tests/ofproto-macros.at b/tests/ofproto-macros.at
index dc9bc8646..1d5a7cfc6 100644
--- a/tests/ofproto-macros.at
+++ b/tests/ofproto-macros.at
@@ -36,8 +36,7 @@ m4_define([OVS_VSWITCHD_START],
    trap 'kill `cat ovsdb-server.pid ovs-vswitchd.pid`' 0
 
    dnl Create database.
-   mkdir openvswitch
-   touch openvswitch/.conf.db.~lock~
+   touch .conf.db.~lock~
    AT_CHECK([ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema])
 
    dnl Start ovsdb-server.