|
 |
ea8ea4 |
From 7b91fa37de7a6c8dc9160a0bf5222e0c66dfdf20 Mon Sep 17 00:00:00 2001
|
|
|
ea8ea4 |
From: Eric Garver <eric@garver.life>
|
|
|
ea8ea4 |
Date: Mon, 3 Feb 2020 08:25:32 -0500
|
|
|
ea8ea4 |
Subject: [PATCH 127/146] fix: tests: failures if modprobe not usable
|
|
|
ea8ea4 |
|
|
|
ea8ea4 |
This is a stable branch only fix. It's necessary because we won't be
|
|
|
ea8ea4 |
backporting b3faacee1096 ("improvement: always create conntrack helper
|
|
|
ea8ea4 |
rules") from the master branch.
|
|
|
ea8ea4 |
|
|
|
ea8ea4 |
Fixes: cef1e52af875 ("fix: failure to load modules no longer fatal")
|
|
|
ea8ea4 |
(cherry picked from commit ea03768d725b5b5c7b4009e500352c830880042d)
|
|
|
ea8ea4 |
(cherry picked from commit 9a67940e3108d2ea3bc5b052a8c07aa7c2f75e40)
|
|
|
ea8ea4 |
---
|
|
|
ea8ea4 |
src/tests/functions.at | 2 ++
|
|
|
ea8ea4 |
1 file changed, 2 insertions(+)
|
|
|
ea8ea4 |
|
|
|
ea8ea4 |
diff --git a/src/tests/functions.at b/src/tests/functions.at
|
|
|
ea8ea4 |
index 881b8b7c067e..6fdb33824042 100644
|
|
|
ea8ea4 |
--- a/src/tests/functions.at
|
|
|
ea8ea4 |
+++ b/src/tests/functions.at
|
|
|
ea8ea4 |
@@ -144,6 +144,8 @@ m4_define([FWD_END_TEST], [
|
|
|
ea8ea4 |
sed -i "/WARNING: ip6tables not usable, disabling IPv6 firewall/d" ./firewalld.log
|
|
|
ea8ea4 |
])
|
|
|
ea8ea4 |
sed -i "/modprobe: ERROR:/d" ./firewalld.log
|
|
|
ea8ea4 |
+ sed -i "/WARNING: Failed to load nf_conntrack module/d" ./firewalld.log
|
|
|
ea8ea4 |
+ sed -i "/WARNING: Failed to get and parse nf_conntrack_helper setting/d" ./firewalld.log
|
|
|
ea8ea4 |
if test x"$1" != x"ignore"; then
|
|
|
ea8ea4 |
if test -n "$1"; then
|
|
|
ea8ea4 |
sed -i $1 ./firewalld.log
|
|
|
ea8ea4 |
--
|
|
|
ea8ea4 |
2.23.0
|
|
|
ea8ea4 |
|