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 ae96c2a2703f5f98b8a97a08f15c398b5a5f5f2f..4e20754120df437f3b8a212c648e9546bf165e37 100755 (executable)
--- 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'