diff options
| author | George Diamantopoulos <georgediam@gmail.com> | 2019-03-21 20:48:49 +0200 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2019-03-22 13:44:01 -0700 |
| commit | b75803c457d89ce98134e91772dd01bb839764bd (patch) | |
| tree | 003fce93da594985fa1011c42d8fdff76e39d112 | |
| parent | 60c5e7ac83a61a118f7c0a7ea7d2f1905036e0a5 (diff) | |
| download | openvswitch-b75803c457d89ce98134e91772dd01bb839764bd.tar.gz | |
ifupdown.sh: Add missing "--may-exist" option
The ifupdown.sh script passes the --may-exist option
to ovs-vsctl invocations in order for it to exit without failing
if the device to be added already exists. This holds true for
all cases of adding objects to ovs-vswitchd except for when
configuring a bond interface.
This patch adds the --may-exist option to the missing
statement, which suppresses the logging of such errors in
syslog.
Additionally, running the unpatched version of this script when
the bond interface already exists appears to break
networking with some versions of ifupdown found in debian
testing (0.8.35), where the service won't start up properly
because of the aforementioned errors.
Signed-off-by: George Diamantopoulos <georgediam@gmail.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
| -rwxr-xr-x | debian/ifupdown.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/ifupdown.sh b/debian/ifupdown.sh index fe15b71cc..b98c6c310 100755 --- a/debian/ifupdown.sh +++ b/debian/ifupdown.sh @@ -60,7 +60,7 @@ if [ "${MODE}" = "start" ]; then ifconfig "${IFACE}" up ;; OVSBond) - ovs_vsctl -- --fake-iface add-bond "${IF_OVS_BRIDGE}"\ + ovs_vsctl -- --fake-iface --may-exist add-bond "${IF_OVS_BRIDGE}"\ "${IFACE}" ${IF_OVS_BONDS} ${IF_OVS_OPTIONS} \ ${OVS_EXTRA+-- $OVS_EXTRA} |