Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix typo in sysinfo CONFIG_NF_CONNTRACK_IPV4/IPV6 description #5395

Merged
merged 3 commits into from
Jan 8, 2025
Merged

Fix typo in sysinfo CONFIG_NF_CONNTRACK_IPV4/IPV6 description #5395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f3d32c2
Fix typo in host_linux.go
tmalaher Jan 1, 2025
b524e28
Fix typo in raspberry-pi4.md
tmalaher Jan 1, 2025
9f5ed78
Align comments in host_linux.go
tmalaher Jan 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/raspberry-pi4.md
View file
Open in desktop
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
View file
Open in desktop
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
Loading