bonding: Ignore updelay if there is no active slave.

[openvswitch] / xenserver / etc_init.d_vswitch

diff --git a/xenserver/etc_init.d_vswitch b/xenserver/etc_init.d_vswitch
index c5659e0d04fdf8e9c6964ea40ddb0146bd321c26..f0b8be2c89b82fa3547c21c08f2b43ee11f76bcb 100755 (executable)
--- a/xenserver/etc_init.d_vswitch
+++ b/xenserver/etc_init.d_vswitch
@@ -268,6 +268,14 @@ function start {
     if [ ! -e "$VSWITCHD_CONF" ]; then
         warning "$VSWITCHD_CONF does not exist"
         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.*' \
+            '--del-match=vlan.*'
     fi
 
     start_vswitchd