dirs: dbdir default must be based on sysconfdir.
authorBen Pfaff <blp@nicira.com>
Thu, 2 Aug 2012 23:01:49 +0000 (16:01 -0700)
committerBen Pfaff <blp@nicira.com>
Fri, 3 Aug 2012 17:32:28 +0000 (10:32 -0700)
commitc3bf549800cecfa0c5fbd669139f441b7dd5d237
treed6a791bb08d23a95b1c38f3061ea9257e1b2f5da
parentdc5a7ce79de0d746a4f4af1a127249f90b797002
dirs: dbdir default must be based on sysconfdir.

Some in-tree and out-of-tree code sets the OVS_SYSCONFDIR environment
variable to control where /etc files go (mostly for test purposes).  When
the database directory (dbdir) was split off from the sysconfdir, the
configure-time default continued to be based on the sysconfdir, but
overriding the sysconfdir at runtime with OVS_SYSCONFDIR didn't have any
effect on the dbdir, which caused a visible change in behavior for code
that set the OVS_SYSCONFDIR environment variable.  This commit reverts that
change in behavior, by basing the dbdir on OVS_SYSCONFDIR if that
environment variable is set (but the OVS_DBDIR environment variable is
not).

Signed-off-by: Ben Pfaff <blp@nicira.com>
lib/dirs.c.in
python/automake.mk
python/ovs/dirs.py
python/ovs/dirs.py.template [new file with mode: 0644]
utilities/ovs-lib.in