From 883b106184656ff004f15c7872de31433918c94f Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@nicira.com>
Date: Wed, 17 Mar 2010 09:48:05 -0700
Subject: [PATCH] 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.
---
 xenserver/etc_init.d_vswitch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xenserver/etc_init.d_vswitch b/xenserver/etc_init.d_vswitch
index b1014a711..304eabb1c 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
-- 
2.43.0