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 6ea369ffbbc3017d743cc839627abf3c1d9aee9b..29d79added53d0f4cc1c1fb2e72d14d72523e4f3 100755 (executable)
--- 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 58e35dec95e6b8cc23f5bb8e78dece0d6d8b8933..489766908ba425e252fbe7872c1dc45bd39164c7 100644 (file)
--- 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,