don't complain on relaunch when ODP is not supported

...and WEAVE_NO_FASTDP isn't set.

Fixes #1929.
This commit is contained in:
Matthias Radestock committed 2016-02-18 22:00:08 +00:00
1 parent 5e761a62b0
commit ee531b8023
1 file changed
+3 -1
+3 -1
View File
@@ -536,7 +536,9 @@ create_bridge() {
add_iptables_rule nat POSTROUTING -j WEAVE
else
if [ -n "$LAUNCHING_ROUTER" ] ; then
if [ "$BRIDGE_TYPE" = bridge -a -z "$WEAVE_NO_FASTDP" ] ; then
if [ "$BRIDGE_TYPE" = bridge -a -z "$WEAVE_NO_FASTDP" ] &&
util_op create-datapath $DATAPATH 2>/dev/null &&
util_op delete-datapath $DATAPATH 2>/dev/null ; then
cat <<EOF >&1
WEAVE_NO_FASTDP is not set, but there is already a bridge present of
the wrong type for fast datapath. Please do 'weave reset' to remove