From c784cc04752703fc734307e8e48e6e6c6728e0a8 Mon Sep 17 00:00:00 2001
From: "Hussey, Scott (sh8121)" <sh8121@att.com>
Date: Wed, 19 Jun 2019 10:36:17 -0500
Subject: [PATCH] (fix) Fix br_netfilter disable persistence

- The persistence of the br_netfilter disable settings wasn't
  working due to the br_netfilter kmod loading after sysctl
  settings are applied. Add a udev rule so that the sysctl
  settings are applied when the module loads.

Change-Id: I31eae66f953e644c09b86d5449ac79cf253d5df3
---
 tools/multi_nodes_gate/setup_gate.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/multi_nodes_gate/setup_gate.sh b/tools/multi_nodes_gate/setup_gate.sh
index 150afbac..2039911c 100755
--- a/tools/multi_nodes_gate/setup_gate.sh
+++ b/tools/multi_nodes_gate/setup_gate.sh
@@ -100,6 +100,10 @@ net.bridge.bridge-nf-call-ip6tables = 0
 net.bridge.bridge-nf-call-iptables = 0
 net.bridge.bridge-nf-call-arptables = 0
 EOF
+cat << EOF | sudo tee /etc/udev/rules.d/99-bridge.rules
+ACTION=="add", SUBSYSTEM=="module", KERNEL=="br_netfilter", \
+                RUN+="/lib/systemd/systemd-sysctl --prefix=/net/bridge"
+EOF
 besteffort sudo sysctl -p /etc/sysctl.d/60-bridge.conf
 
 if [[ ${REQUIRE_RELOG} -eq 1 ]]; then