Browse code

contrib/check-config.sh: fix NF_NAT_IPV4

CONFIG_NF_NAT_IPV4 was removed in kernel commit 3bf195ae6037e310,
which made its way into v5.1-rc1. The functionality is now under
NF_NAT which we already check for.

Make the check for NF_NAT_IPV4 conditional.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit eeb53c1f228ddaf1c4771282b6b07524e40bbacb)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Kir Kolyshkin authored on 2021/01/12 05:38:33
Showing 1 changed files
... ...
@@ -196,7 +196,7 @@ flags=(
196 196
 	CGROUPS CGROUP_CPUACCT CGROUP_DEVICE CGROUP_FREEZER CGROUP_SCHED CPUSETS MEMCG
197 197
 	KEYS
198 198
 	VETH BRIDGE BRIDGE_NETFILTER
199
-	NF_NAT_IPV4 IP_NF_FILTER IP_NF_TARGET_MASQUERADE
199
+	IP_NF_FILTER IP_NF_TARGET_MASQUERADE
200 200
 	NETFILTER_XT_MATCH_{ADDRTYPE,CONNTRACK,IPVS}
201 201
 	IP_NF_NAT NF_NAT NF_NAT_NEEDED
202 202
 
... ...
@@ -208,6 +208,10 @@ if [ "$kernelMajor" -lt 4 ] || ([ "$kernelMajor" -eq 4 ] && [ "$kernelMinor" -lt
208 208
 	check_flags DEVPTS_MULTIPLE_INSTANCES
209 209
 fi
210 210
 
211
+if [ "$kernelMajor" -lt 5 ] || [ "$kernelMajor" -eq 5 -a "$kernelMinor" -le 1 ]; then
212
+	check_flags NF_NAT_IPV4
213
+fi
214
+
211 215
 echo
212 216
 
213 217
 echo 'Optional Features:'