From: Ben Pfaff <blp@nicira.com>
Date: Fri, 5 Jun 2009 18:18:33 +0000 (-0700)
Subject: xenserver: Rename cache file to ovs-vswitch.dbache, for consistency.
X-Git-Tag: v0.90.1~46
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0bb1f43dd8f5e894ed45d158daa5f94f4990c05a;p=sliver-openvswitch.git

xenserver: Rename cache file to ovs-vswitch.dbache, for consistency.

Fixes bug #1374.
---

diff --git a/xenserver/opt_xensource_libexec_interface-reconfigure b/xenserver/opt_xensource_libexec_interface-reconfigure
index 6ea369ffb..29d79adde 100755
--- a/xenserver/opt_xensource_libexec_interface-reconfigure
+++ b/xenserver/opt_xensource_libexec_interface-reconfigure
@@ -69,7 +69,7 @@ output_directory = None
 db = None
 management_pif = None
 
-dbcache_file = "/etc/vswitch.dbcache"
+dbcache_file = "/etc/ovs-vswitch.dbcache"
 vswitch_config_dir = "/etc/openvswitch"
 
 class Usage(Exception):
diff --git a/xenserver/vswitch-xen.spec b/xenserver/vswitch-xen.spec
index 58e35dec9..489766908 100644
--- a/xenserver/vswitch-xen.spec
+++ b/xenserver/vswitch-xen.spec
@@ -114,7 +114,7 @@ EOF
     fi
 fi
 
-if test ! -e /etc/vswitch.dbcache; then
+if test ! -e /etc/ovs-vswitch.dbcache; then
     if test "$1" = 1; then
         printf "Creating xapi database cache...  "
     else
@@ -141,7 +141,7 @@ try:
 finally:
     session.xenapi.session.logout()
 
-dbcache_file = "/etc/vswitch.dbcache"
+dbcache_file = "/etc/ovs-vswitch.dbcache"
 f = open(dbcache_file, 'w')
 pickle.dump({'vlans': vlans,
              'bonds': bonds,