From: Ben Pfaff <blp@nicira.com>
Date: Thu, 4 Mar 2010 00:56:47 +0000 (-0800)
Subject: xenserver: Include the vswitch database contents in bugtool reports.
X-Git-Tag: v1.0.0~259^2~50
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=864342ad83da24ca1a89bb7db7a9b813425ca3ed;p=sliver-openvswitch.git

xenserver: Include the vswitch database contents in bugtool reports.

/etc/ovs-vswitchd.conf no longer exists, but /etc/ovs-vswitchd.conf.db
does.

Signed-off-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/xenserver/usr_sbin_xen-bugtool b/xenserver/usr_sbin_xen-bugtool
index ae96c2a27..4e2075412 100755
--- a/xenserver/usr_sbin_xen-bugtool
+++ b/xenserver/usr_sbin_xen-bugtool
@@ -120,7 +120,7 @@ HP_HPASMD_LOG = '/var/spool/compaq/hpasmd.log'
 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_CONF = '/etc/ovs-vswitchd.conf.db'
 OVS_VSWITCH_DBCACHE = '/var/xapi/network.dbcache'
 XENSOURCE_INVENTORY = '/etc/xensource-inventory'
 OEM_CONFIG_DIR = '/var/xsconfig'