From e77526c478706d8d057554d0d87e7531edd17985 Mon Sep 17 00:00:00 2001
From: Scott Hussey <sthussey@att.com>
Date: Fri, 12 Jul 2019 07:00:23 -0500
Subject: [PATCH] (multinode) Besteffort to disable brnetfilter

- Create the besteffort utility function to run a command
  outside of set -e

- Use besteffort to disable brnetfilter so the gate survives
  when the kernel module isn't loaded.

Change-Id: Ic79aff8cce357d02715a305664ca700e54822627
---
 tools/multi_nodes_gate/airship_gate/lib/config.sh | 6 ++++++
 tools/multi_nodes_gate/setup_gate.sh              | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/tools/multi_nodes_gate/airship_gate/lib/config.sh b/tools/multi_nodes_gate/airship_gate/lib/config.sh
index 6b7a41a9..b2b0b699 100644
--- a/tools/multi_nodes_gate/airship_gate/lib/config.sh
+++ b/tools/multi_nodes_gate/airship_gate/lib/config.sh
@@ -134,3 +134,9 @@ join_array() {
   shift
   echo "$*"
 }
+
+besteffort() {
+  set +e
+  $@
+  set -e
+}
diff --git a/tools/multi_nodes_gate/setup_gate.sh b/tools/multi_nodes_gate/setup_gate.sh
index c176f874..150afbac 100755
--- a/tools/multi_nodes_gate/setup_gate.sh
+++ b/tools/multi_nodes_gate/setup_gate.sh
@@ -100,7 +100,7 @@ net.bridge.bridge-nf-call-ip6tables = 0
 net.bridge.bridge-nf-call-iptables = 0
 net.bridge.bridge-nf-call-arptables = 0
 EOF
-sudo sysctl -p /etc/sysctl.d/60-bridge.conf
+besteffort sudo sysctl -p /etc/sysctl.d/60-bridge.conf
 
 if [[ ${REQUIRE_RELOG} -eq 1 ]]; then
     echo