From 83889ee71649aa76bed685271b114f37de9f5af5 Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@nicira.com>
Date: Thu, 10 Dec 2009 16:43:10 -0800
Subject: [PATCH] xensource: Add kluge to make interface-reconfigure work
 better.

This change makes xsconsole able to reconfigure the management interface
on some XenServer hosts.  It's not clear why it is needed--apparently
xapi is creating the bridge behind our back.
---
 xenserver/opt_xensource_libexec_interface-reconfigure | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/xenserver/opt_xensource_libexec_interface-reconfigure b/xenserver/opt_xensource_libexec_interface-reconfigure
index 8119ee86..9a3ef822 100755
--- a/xenserver/opt_xensource_libexec_interface-reconfigure
+++ b/xenserver/opt_xensource_libexec_interface-reconfigure
@@ -1375,6 +1375,9 @@ def configure_datapath(pif):
         if len(offload):
             run_command(['/sbin/ethtool', '-K', dev] + offload)
 
+    # XXX It seems like the following should not be necessary...
+    cfgmod_argv += ['--', '--if-exists', 'del-br', bridge]
+                    
     if pif_is_vlan(pif):
         datapath = pif_datapath(pif)
         vlan = db.get_pif_record(pif)['VLAN']
-- 
2.30.2