From: Ben Pfaff <blp@nicira.com>
Date: Thu, 14 May 2009 16:08:20 +0000 (-0700)
Subject: Apply temporary band-aid to VLAN-related OOPS on XenServer.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef4a656e73b3bf157519a8f6e239c0e5f54600a3;p=openvswitch

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 3ec78262..fa18be19 100755
--- 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)