Browse code
contrib/check-config.sh: fix NF_NAT_NEEDED
CONFIG_NF_NAT_NEEDED was removed in kernel commit 4806e975729f99c7,
which made its way into v5.2-rc1. The functionality is now under
NF_NAT which we already check for.
Make the check for NF_NAT_NEEDED conditional.
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit 03da41152af41b2ac94d86021b5369fc13bf9d34)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Kir Kolyshkin authored on 2021/01/12 05:40:53Showing 1 changed files
| ... | ... |
@@ -198,7 +198,7 @@ flags=( |
| 198 | 198 |
VETH BRIDGE BRIDGE_NETFILTER |
| 199 | 199 |
IP_NF_FILTER IP_NF_TARGET_MASQUERADE |
| 200 | 200 |
NETFILTER_XT_MATCH_{ADDRTYPE,CONNTRACK,IPVS}
|
| 201 |
- IP_NF_NAT NF_NAT NF_NAT_NEEDED |
|
| 201 |
+ IP_NF_NAT NF_NAT |
|
| 202 | 202 |
|
| 203 | 203 |
# required for bind-mounting /dev/mqueue into containers |
| 204 | 204 |
POSIX_MQUEUE |
| ... | ... |
@@ -212,6 +212,10 @@ if [ "$kernelMajor" -lt 5 ] || [ "$kernelMajor" -eq 5 -a "$kernelMinor" -le 1 ]; |
| 212 | 212 |
check_flags NF_NAT_IPV4 |
| 213 | 213 |
fi |
| 214 | 214 |
|
| 215 |
+if [ "$kernelMajor" -lt 5 ] || [ "$kernelMajor" -eq 5 -a "$kernelMinor" -le 2 ]; then |
|
| 216 |
+ check_flags NF_NAT_NEEDED |
|
| 217 |
+fi |
|
| 218 |
+ |
|
| 215 | 219 |
echo |
| 216 | 220 |
|
| 217 | 221 |
echo 'Optional Features:' |