From fd01149ad7a5bdea90c12bd00907e4dbef67fa51 Mon Sep 17 00:00:00 2001 From: George Diamantopoulos Date: Thu, 21 Mar 2019 20:48:49 +0200 Subject: [PATCH] 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 Signed-off-by: Ben Pfaff --- debian/ifupdown.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/ifupdown.sh b/debian/ifupdown.sh index e9f2b5ceedf..9a7772d032b 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}