From aeb4cedaa13940b1ec5322db6b743ce07296d874 Mon Sep 17 00:00:00 2001
From: Ian Campbell <Ian.Campbell@citrix.com>
Date: Fri, 2 Oct 2009 14:43:20 +0100
Subject: [PATCH] xenserver: Clear vlan.* from /etc/ovs-vswitchd.conf on boot
 too

---
 xenserver/etc_init.d_vswitch | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xenserver/etc_init.d_vswitch b/xenserver/etc_init.d_vswitch
index 6aca1cc7..f0b8be2c 100755
--- a/xenserver/etc_init.d_vswitch
+++ b/xenserver/etc_init.d_vswitch
@@ -274,7 +274,8 @@ function start {
             '--del-match=bridge.*' \
             '--del-match=port.*' \
             '--del-match=bonding.*' \
-            '--del-match=iface.*'
+            '--del-match=iface.*' \
+            '--del-match=vlan.*'
     fi
 
     start_vswitchd
-- 
2.30.2