From 095b942e31767a9bac2164b2bb12445974273223 Mon Sep 17 00:00:00 2001
From: Paul-Emmanuel Raoul <sky...@skyplabs.net>
Date: Thu, 18 Dec 2014 00:25:46 +0100
Subject: [PATCH] ovs-docker : Handle pre-existing fake bridges.
Signed-off-by: Paul-Emmanuel Raoul <sky...@skyplabs.net>
---
utilities/ovs-docker | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/utilities/ovs-docker b/utilities/ovs-docker
index 4a43a15..a48282b 100755
--- a/utilities/ovs-docker
+++ b/utilities/ovs-docker
@@ -53,7 +53,8 @@ add_port () {
exit 1
fi
- if ovs_vsctl --may-exist add-br "$BRIDGE"; then :; else
+ if ovs_vsctl br-exists "$BRIDGE" || \
+ ovs_vsctl add-br "$BRIDGE"; then :; else
echo >&2 "$UTIL: Failed to create bridge $BRIDGE"
exit 1
fi
--
1.7.10.4
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
