From 1f7d95d4bec027799ecc4aff47dbd7d2a636dd23 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Fri, 11 Oct 2024 11:50:34 -0400 Subject: [PATCH] test/suites/container_devices_nic_bridged_filtering: unload br_netfilter once done Signed-off-by: Simon Deziel --- test/suites/container_devices_nic_bridged_filtering.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/suites/container_devices_nic_bridged_filtering.sh b/test/suites/container_devices_nic_bridged_filtering.sh index 7a84eee884ab..5d74c168e64a 100644 --- a/test/suites/container_devices_nic_bridged_filtering.sh +++ b/test/suites/container_devices_nic_bridged_filtering.sh @@ -324,12 +324,14 @@ test_container_devices_nic_bridged_filtering() { # Make sure br_netfilter is loaded, needed for IPv6 filtering. modprobe br_netfilter || true - if ! grep 1 /proc/sys/net/bridge/bridge-nf-call-ip6tables ; then + read -r CALL_IP6TABLES < /proc/sys/net/bridge/bridge-nf-call-ip6tables || true + if [ "${CALL_IP6TABLES:-0}" -ne 1 ]; then echo "br_netfilter didn't load, skipping IPv6 filter checks" lxc delete -f "${ctPrefix}A" lxc delete -f "${ctPrefix}B" lxc profile delete "${ctPrefix}" lxc network delete "${brName}" + modprobe -r br_netfilter || true return fi @@ -901,4 +903,7 @@ test_container_devices_nic_bridged_filtering() { echo "leftover NICS detected" false fi + + # Cleanup + modprobe -r br_netfilter || true }