From 8a856a63b3373a7f317d521383c1e7e5a06f352d Mon Sep 17 00:00:00 2001 From: Paul-Emmanuel Raoul Date: Thu, 18 Dec 2014 01:32:35 +0100 Subject: [PATCH] ovs-docker : Handle pre-existing fake bridges. Signed-off-by: Paul-Emmanuel Raoul Signed-off-by: Gurucharan Shetty --- AUTHORS | 1 + utilities/ovs-docker | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index ed7e9b76d..f6ab641c5 100644 --- a/AUTHORS +++ b/AUTHORS @@ -114,6 +114,7 @@ Padmanabhan Krishnan kprad1@yahoo.com Paraneetharan Chandrasekaran paraneetharanc@gmail.com Paul Fazzone pfazzone@nicira.com Paul Ingram paul@nicira.com +Paul-Emmanuel Raoul skyper@skyplabs.net Pavithra Ramesh paramesh@vmware.com Philippe Jung phil.jung@free.fr Pim van den Berg pim@nethuis.nl diff --git a/utilities/ovs-docker b/utilities/ovs-docker index 0c708903c..48908b1f6 100755 --- a/utilities/ovs-docker +++ b/utilities/ovs-docker @@ -68,7 +68,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 -- 2.20.1