From f3d32c2aa8fc93fbd91c9e6b2b0841470b6f201b Mon Sep 17 00:00:00 2001 From: Tom Malaher Date: Wed, 1 Jan 2025 09:35:18 -0700 Subject: [PATCH 1/3] Fix typo in host_linux.go s/connetion/connection/ Signed-off-by: Tom Malaher --- internal/pkg/sysinfo/host_linux.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/pkg/sysinfo/host_linux.go b/internal/pkg/sysinfo/host_linux.go index 0f409943adf2..7d8aaf327144 100644 --- a/internal/pkg/sysinfo/host_linux.go +++ b/internal/pkg/sysinfo/host_linux.go @@ -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") @@ -162,7 +162,7 @@ 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_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") From b524e28620b9f7e0e39bdfca4bc774b419381c60 Mon Sep 17 00:00:00 2001 From: Tom Malaher Date: Wed, 1 Jan 2025 09:39:14 -0700 Subject: [PATCH 2/3] Fix typo in raspberry-pi4.md s/connetion/connection/ to match internal/pkg/sysinfo/host_linux.go Signed-off-by: Tom Malaher --- docs/raspberry-pi4.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/raspberry-pi4.md b/docs/raspberry-pi4.md index 7a676ce7f57a..012be0dff663 100644 --- a/docs/raspberry-pi4.md +++ b/docs/raspberry-pi4.md @@ -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) @@ -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) From 9f5ed785a3d5b7e61ea5e75d68c68d783ee8516b Mon Sep 17 00:00:00 2001 From: Tom Malaher Date: Thu, 2 Jan 2025 07:38:44 -0700 Subject: [PATCH 3/3] Align comments in host_linux.go ...to match change in previous line. Signed-off-by: Tom Malaher --- internal/pkg/sysinfo/host_linux.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/pkg/sysinfo/host_linux.go b/internal/pkg/sysinfo/host_linux.go index 7d8aaf327144..f34fb41cff91 100644 --- a/internal/pkg/sysinfo/host_linux.go +++ b/internal/pkg/sysinfo/host_linux.go @@ -163,7 +163,7 @@ func (s *K0sSysinfoSpec) addKernelConfigs(linux *linux.LinuxProbes) { // IPv6: Netfilter Configuration 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) + 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")