From: Ben Pfaff <blp@nicira.com>
Date: Wed, 17 Mar 2010 16:48:05 +0000 (-0700)
Subject: xenserver: Must pass --no-wait to ovs-vsctl before starting ovs-vswitchd.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=883b106184656ff004f15c7872de31433918c94f;p=openvswitch

xenserver: Must pass --no-wait to ovs-vsctl before starting ovs-vswitchd.

Otherwise ovs-vsctl pauses until it times out waiting for ovs-vswitchd to
reload its configuration.
---

diff --git a/xenserver/etc_init.d_vswitch b/xenserver/etc_init.d_vswitch
index b1014a71..304eabb1 100755
--- a/xenserver/etc_init.d_vswitch
+++ b/xenserver/etc_init.d_vswitch
@@ -322,7 +322,7 @@ function set_system_uuid {
     system_uuid=$(. /etc/xensource-inventory && echo $INSTALLATION_UUID)
     if test -n "$system_uuid"; then
         action "Configuring Open vSwitch system UUID" true
-        $vsctl set Open_vSwitch . external-ids:system-uuid="$system_uuid"
+        $vsctl --no-wait set Open_vSwitch . external-ids:system-uuid="$system_uuid"
     else
         action "Configuring Open vSwitch system UUID" false
     fi