Apply temporary band-aid to VLAN-related OOPS on XenServer.

Now, VLAN devices will be disabled by default.  To enable them, create a
file named /etc/vswitchd.enable-vlans.

This commit will be reverted when a real fix is available.

diff --git a/xenserver/opt_xensource_libexec_interface-reconfigure b/xenserver/opt_xensource_libexec_interface-reconfigure
index 3ec7826240b3f452694d48925aaffddb61611eca..fa18be198b1029426eefb5ee90ccbaf260d2407c 100755 (executable)
--- a/xenserver/opt_xensource_libexec_interface-reconfigure
+++ b/xenserver/opt_xensource_libexec_interface-reconfigure
@@ -844,7 +844,8 @@ def action_up(pif):
         argv += ['--add=bridge.%s.port=%s' % (datapath, port)]
     if vlan_slave:
         argv += ['--add=vlan.%s.tag=%s' % (ipdev, pifrec['VLAN'])]
-        argv += ['--add=iface.%s.internal=true' % (ipdev)]
+        if os.path.exists("/etc/vswitchd.enable-vlans"):
+            argv += ['--add=iface.%s.internal=true' % (ipdev)]
     if bond_master:
         argv += configure_bond(bond_master)
     modify_config(argv)