Merge citrix branch into master.

[openvswitch] / xenserver / etc_init.d_vswitch

diff --git a/xenserver/etc_init.d_vswitch b/xenserver/etc_init.d_vswitch
index 09f5d79187702b52a13aee7488cb487c44c3a764..bd621c106363a8739810cb455924f0bf8703c4fd 100755 (executable)
--- a/xenserver/etc_init.d_vswitch
+++ b/xenserver/etc_init.d_vswitch
@@ -268,7 +268,8 @@ function start {
             '--del-match=port.*' \
             '--del-match=bonding.*' \
             '--del-match=iface.*' \
-            '--del-match=vlan.*'
+            '--del-match=vlan.*.trunks=*' \
+            '--del-match=vlan.*.tag=*'
     fi
 
     start_vswitchd