X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=xenserver%2Fopt_xensource_libexec_interface-reconfigure;h=d346cdc4b1b78812c3fccdef670ef000a6a1285a;hb=539e96f62300e4afab00e5906a28e3b89301d62e;hp=8119ee86e6eb8700a72c3dbd355383267aa2753d;hpb=c0eb8e3158299f50270b283adb55da65c736246a;p=openvswitch

diff --git a/xenserver/opt_xensource_libexec_interface-reconfigure b/xenserver/opt_xensource_libexec_interface-reconfigure
index 8119ee86..d346cdc4 100755
--- a/xenserver/opt_xensource_libexec_interface-reconfigure
+++ b/xenserver/opt_xensource_libexec_interface-reconfigure
@@ -1257,7 +1257,6 @@ def datapath_modify_config(commands):
                      + [c for c in commands if not c.startswith('#')])
     if not rc:
         raise Error("Failed to modify vswitch configuration")
-    run_command(['/bin/sleep', '5']) # XXX
     return True
 
 #
@@ -1375,6 +1374,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']
@@ -1456,7 +1458,7 @@ def action_up(pif):
             xs_network_uuids += [nwrec['uuid']]
         cfgmod_argv += ['# configure xs-network-uuids']
         cfgmod_argv += ['--', 'br-set-external-id', bridge,
-                        'xs-network-uuids', ' '.join(xs_network_uuids)]
+                        'xs-network-uuids', ';'.join(xs_network_uuids)]
 
         if ipdev != bridge:
             cfgmod_argv += ["# deconfigure ipdev %s" % ipdev]