From: Ben Pfaff <blp@nicira.com>
Date: Thu, 14 May 2009 18:22:01 +0000 (-0700)
Subject: Revert "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=21f0abe3566bb6788486bbd87bada294cf59db73;p=openvswitch

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

This reverts commit ef4a656e73b3bf157519a8f6e239c0e5f54600a3,
since the need for it was eliminated (I hope).
---

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