Skip to content

Commit 483abaa

Browse files
committed
script/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>
1 parent 91eba84 commit 483abaa

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

script/check-config.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,14 +203,19 @@ flags=(
203203
CGROUPS CGROUP_CPUACCT CGROUP_DEVICE CGROUP_FREEZER CGROUP_SCHED CPUSETS MEMCG
204204
KEYS
205205
VETH BRIDGE BRIDGE_NETFILTER
206-
NF_NAT_IPV4 IP_NF_FILTER IP_NF_TARGET_MASQUERADE
206+
IP_NF_FILTER IP_NF_TARGET_MASQUERADE
207207
NETFILTER_XT_MATCH_{ADDRTYPE,CONNTRACK,IPVS}
208208
IP_NF_NAT NF_NAT NF_NAT_NEEDED
209209

210210
# required for bind-mounting /dev/mqueue into containers
211211
POSIX_MQUEUE
212212
)
213213
check_flags "${flags[@]}"
214+
215+
if [ "$kernelMajor" -lt 5 ] || [ "$kernelMajor" -eq 5 -a "$kernelMinor" -le 1 ]; then
216+
check_flags NF_NAT_IPV4
217+
fi
218+
214219
echo
215220

216221
echo 'Optional Features:'

0 commit comments

Comments
 (0)