Merge "citrix" branch into "master.

[sliver-openvswitch.git] / xenserver / etc_init.d_vswitch

diff --git a/xenserver/etc_init.d_vswitch b/xenserver/etc_init.d_vswitch
index 9e0efe0..01450ed 100755 (executable)
--- a/xenserver/etc_init.d_vswitch
+++ b/xenserver/etc_init.d_vswitch
@@ -266,11 +266,12 @@ function start {
         action "Creating empty $VSWITCHD_CONF" touch "$VSWITCHD_CONF"
     elif [ ! -e /var/run/vswitch.booted ]; then
         touch /var/run/vswitch.booted
-       /usr/bin/ovs-cfg-mod '-vANY:console:emer' -F "$VSWITCHD_CONF" \
-           '--del-match=bridge.*' \
-           '--del-match=port.*' \
-           '--del-match=bonding.*' \
-           '--del-match=iface.*'
+        /usr/bin/ovs-cfg-mod '-vANY:console:emer' -F "$VSWITCHD_CONF" \
+            '--del-match=bridge.*' \
+            '--del-match=port.*' \
+            '--del-match=bonding.*' \
+            '--del-match=iface.*' \
+            '--del-match=vlan.*'
     fi
 
     start_vswitchd