Merge commit 'origin/citrix'

[sliver-openvswitch.git] / xenserver / usr_sbin_xen-bugtool

diff --git a/xenserver/usr_sbin_xen-bugtool b/xenserver/usr_sbin_xen-bugtool
index 4466125..39df1c8 100755 (executable)
--- a/xenserver/usr_sbin_xen-bugtool
+++ b/xenserver/usr_sbin_xen-bugtool
@@ -121,6 +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 = '/etc/ovs-vswitch.dbcache'
 XENSOURCE_INVENTORY = '/etc/xensource-inventory'
 OEM_CONFIG_DIR = '/var/xsconfig'
 OEM_CONFIG_FILES_RE = re.compile(r'^.*xensource-inventory$')
@@ -195,8 +196,8 @@ MD5SUM = '/usr/bin/md5sum'
 MULTIPATHD = '/sbin/multipathd'
 NETSTAT = '/bin/netstat'
 OMREPORT = '/opt/dell/srvadmin/oma/bin/omreport'
-OVS_DPCTL = '/root/vswitch/bin/ovs-dpctl'
-OVS_OFCTL = '/root/vswitch/bin/ovs-ofctl'
+OVS_DPCTL = '/usr/bin/ovs-dpctl'
+OVS_OFCTL = '/usr/bin/ovs-ofctl'
 PS = '/bin/ps'
 PVS = '/usr/sbin/pvs'
 ROUTE = '/sbin/route'
@@ -710,6 +711,7 @@ exclude those logs from the archive.
     tree_output(CAP_VNCTERM, VNCTERM_CORE_DIR)
 
     file_output(CAP_VSWITCH_CONFIG, [OVS_VSWITCH_CONF])
+    file_output(CAP_VSWITCH_CONFIG, [OVS_VSWITCH_DBCACHE])
 
     file_output(CAP_VSWITCH_LOGS, 
          [ VAR_LOG_DIR + x for x in