xenserver: Update to use upstream XenServer location for dbcache.

I thought that this was going to be more difficult (see this email thread:
http://openvswitch.org/pipermail/dev_openvswitch.org/2010-January/001023.html
) but it turned out to be trivial.

diff --git a/xenserver/opt_xensource_libexec_interface-reconfigure b/xenserver/opt_xensource_libexec_interface-reconfigure
index 4455731f43415f278851b880f80010ca9be14ea5..a350952c33c927ebcf85126163e3db5a5daba799 100755 (executable)
--- a/xenserver/opt_xensource_libexec_interface-reconfigure
+++ b/xenserver/opt_xensource_libexec_interface-reconfigure
@@ -51,7 +51,7 @@ import random
 
 management_pif = None
 
-dbcache_file = "/var/lib/openvswitch/dbcache"
+dbcache_file = "/var/xapi/network.dbcache"
 
 #
 # Logging.

diff --git a/xenserver/usr_sbin_xen-bugtool b/xenserver/usr_sbin_xen-bugtool
index 786ff2f0e4de93aed17e9e19d22206995848a5b0..ae96c2a2703f5f98b8a97a08f15c398b5a5f5f2f 100755 (executable)
--- a/xenserver/usr_sbin_xen-bugtool
+++ b/xenserver/usr_sbin_xen-bugtool
@@ -121,7 +121,7 @@ VAR_LOG_DIR = '/var/log/'
 VNCTERM_CORE_DIR = '/var/xen/vncterm'
 VSWITCH_CORE_DIR = '/var/xen/vswitch'
 OVS_VSWITCH_CONF = '/etc/ovs-vswitchd.conf'
-OVS_VSWITCH_DBCACHE = '/var/lib/openvswitch/dbcache'
+OVS_VSWITCH_DBCACHE = '/var/xapi/network.dbcache'
 XENSOURCE_INVENTORY = '/etc/xensource-inventory'
 OEM_CONFIG_DIR = '/var/xsconfig'
 OEM_CONFIG_FILES_RE = re.compile(r'^.*xensource-inventory$')

diff --git a/xenserver/vswitch-xen.spec b/xenserver/vswitch-xen.spec
index f6c94570182250dd463c2b3897e29e2f898c9d1b..2d8acd5dc3d7856d397598d80b27562001dd47bf 100644 (file)
--- a/xenserver/vswitch-xen.spec
+++ b/xenserver/vswitch-xen.spec
@@ -154,7 +154,7 @@ EOF
     fi
 fi
 
-if test ! -e /var/lib/openvswitch/dbcache; then
+if test ! -e /var/xapi/network.dbcache; then
     if test "$1" = 1; then
         printf "Creating xapi database cache...  "
     else
@@ -299,7 +299,7 @@ if [ "$1" = "0" ]; then     # $1 = 1 for upgrade
     rm -f /etc/ovs-vswitchd.conf
     rm -f /etc/sysconfig/vswitch
     rm -f /etc/ovs-vswitchd.cacert
-    rm -f /var/lib/openvswitch/dbcache
+    rm -f /var/xapi/network.dbcache
 
     # Configure system to use bridge
     echo bridge > /etc/xensource/network.conf