Skip to content

Commit

Permalink
Merge pull request #5395 from tmalaher/patch-1
Browse files Browse the repository at this point in the history
Fix typo in sysinfo CONFIG_NF_CONNTRACK_IPV4/IPV6 description
  • Loading branch information
twz123 authored Jan 8, 2025
2 parents 2d4e336 + 9f5ed78 commit fdcc036
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions docs/raspberry-pi4.md
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ Operating system: Linux (pass)
CONFIG_IP_VS_SH: Source hashing scheduling: module (pass)
CONFIG_IP_VS_RR: Round-robin scheduling: module (pass)
CONFIG_IP_VS_WRR: Weighted round-robin scheduling: module (pass)
CONFIG_NF_CONNTRACK_IPV4: IPv4 connetion tracking support (required for NAT): unknown (warning)
CONFIG_NF_CONNTRACK_IPV4: IPv4 connection tracking support (required for NAT): unknown (warning)
CONFIG_NF_REJECT_IPV4: IPv4 packet rejection: module (pass)
CONFIG_NF_NAT_IPV4: IPv4 NAT: unknown (warning)
CONFIG_IP_NF_IPTABLES: IP tables support: module (pass)
Expand All @@ -227,7 +227,7 @@ Operating system: Linux (pass)
CONFIG_IP_NF_NAT: iptables NAT support: module (pass)
CONFIG_IP_NF_MANGLE: Packet mangling: module (pass)
CONFIG_NF_DEFRAG_IPV4: module (pass)
CONFIG_NF_CONNTRACK_IPV6: IPv6 connetion tracking support (required for NAT): unknown (warning)
CONFIG_NF_CONNTRACK_IPV6: IPv6 connection tracking support (required for NAT): unknown (warning)
CONFIG_NF_NAT_IPV6: IPv6 NAT: unknown (warning)
CONFIG_IP6_NF_IPTABLES: IP6 tables support: module (pass)
CONFIG_IP6_NF_FILTER: Packet filtering: module (pass)
Expand Down
6 changes: 3 additions & 3 deletions internal/pkg/sysinfo/host_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ func (s *K0sSysinfoSpec) addKernelConfigs(linux *linux.LinuxProbes) {
ipvs.AssertKernelConfig("IP_VS_WRR", "Weighted round-robin scheduling")

// IP: Netfilter Configuration
netfilter.AssertKernelConfig("NF_CONNTRACK_IPV4", "IPv4 connetion tracking support (required for NAT)") // enables NF_NAT_IPV4, merged into NF_CONNTRACK in Linux 4.19 (a0ae2562c6c4)
netfilter.AssertKernelConfig("NF_CONNTRACK_IPV4", "IPv4 connection tracking support (required for NAT)") // enables NF_NAT_IPV4, merged into NF_CONNTRACK in Linux 4.19 (a0ae2562c6c4)
netfilter.AssertKernelConfig("NF_REJECT_IPV4", "IPv4 packet rejection")
netfilter.AssertKernelConfig("NF_NAT_IPV4", "IPv4 NAT") // depends on NF_CONNTRACK_IPV4, selects NF_NAT, merged into NF_NAT in Linux 5.1 (3bf195ae6037)
ipNFIPTables := netfilter.AssertKernelConfig("IP_NF_IPTABLES", "IP tables support")
Expand All @@ -162,8 +162,8 @@ func (s *K0sSysinfoSpec) addKernelConfigs(linux *linux.LinuxProbes) {
netfilter.AssertKernelConfig("NF_DEFRAG_IPV4", "")

// IPv6: Netfilter Configuration
netfilter.AssertKernelConfig("NF_CONNTRACK_IPV6", "IPv6 connetion tracking support (required for NAT)") // enables NF_NAT_IPV6, merged into NF_CONNTRACK in Linux 4.19 (a0ae2562c6c4)
netfilter.AssertKernelConfig("NF_NAT_IPV6", "IPv6 NAT") // depends on NF_CONNTRACK_IPV6, selects NF_NAT, merged into NF_NAT in Linux 5.1 (3bf195ae6037)
netfilter.AssertKernelConfig("NF_CONNTRACK_IPV6", "IPv6 connection tracking support (required for NAT)") // enables NF_NAT_IPV6, merged into NF_CONNTRACK in Linux 4.19 (a0ae2562c6c4)
netfilter.AssertKernelConfig("NF_NAT_IPV6", "IPv6 NAT") // depends on NF_CONNTRACK_IPV6, selects NF_NAT, merged into NF_NAT in Linux 5.1 (3bf195ae6037)
ip6NFIPTables := netfilter.AssertKernelConfig("IP6_NF_IPTABLES", "IP6 tables support")
ip6NFIPTables.AssertKernelConfig("IP6_NF_FILTER", "Packet filtering")
ip6NFIPTables.AssertKernelConfig("IP6_NF_MANGLE", "Packet mangling")
Expand Down

0 comments on commit fdcc036

Please sign in to comment.