summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorGeorge Diamantopoulos <georgediam@gmail.com>2019-03-21 20:48:49 +0200
committerBen Pfaff <blp@ovn.org>2019-03-22 13:42:05 -0700
commitacd9a7fae16a6b3d76646ef65e4c26c4b8cd4816 (patch)
tree761c5c5a07058acf0b9ca82434111154ebfffea2 /debian
parentc39751e44539a014e642bcd930cb9e3a33af1805 (diff)
downloadopenvswitch-acd9a7fae16a6b3d76646ef65e4c26c4b8cd4816.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>
Diffstat (limited to 'debian')
-rwxr-xr-xdebian/ifupdown.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/ifupdown.sh b/debian/ifupdown.sh
index e9f2b5cee..9a7772d03 100755
--- a/debian/ifupdown.sh
+++ b/debian/ifupdown.sh
@@ -60,7 +60,7 @@ if [ "${MODE}" = "start" ]; then
ip link set "${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}