Skip to content

Commit 39a5fda

Browse files
yeazelmyeazelm
authored
Merge pull request #296 from yeazelm/revert_iptables_loadable
2 parents 3a327f9 + c3ea560 commit 39a5fda

File tree

4 files changed

+18
-38
lines changed

4 files changed

+18
-38
lines changed

‎packages/kernel-6.12/config-bottlerocket‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -255,14 +255,3 @@ CONFIG_INFINIBAND_USER_MAD=m
255255

256256
# Enable CephFS SELinux labels
257257
CONFIG_CEPH_FS_SECURITY_LABEL=y
258-
259-
# Include some IP/IPv6 Netfilter drivers as modules
260-
CONFIG_IP_NF_IPTABLES_LEGACY=m
261-
CONFIG_IP_NF_FILTER=m
262-
CONFIG_IP_NF_MANGLE=m
263-
CONFIG_IP_NF_RAW=m
264-
CONFIG_IP_NF_SECURITY=m
265-
CONFIG_IP6_NF_IPTABLES_LEGACY=m
266-
CONFIG_IP6_NF_FILTER=m
267-
CONFIG_IP6_NF_MANGLE=m
268-
CONFIG_IP6_NF_RAW=m

‎packages/kernel-6.12/config-full-bottlerocket-aarch64‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1575,7 +1575,7 @@ CONFIG_IP_VS_PE_SIP=m
15751575
# IP: Netfilter Configuration
15761576
#
15771577
CONFIG_NF_DEFRAG_IPV4=m
1578-
CONFIG_IP_NF_IPTABLES_LEGACY=m
1578+
CONFIG_IP_NF_IPTABLES_LEGACY=y
15791579
CONFIG_NF_SOCKET_IPV4=m
15801580
CONFIG_NF_TPROXY_IPV4=m
15811581
CONFIG_NF_TABLES_IPV4=y
@@ -1595,18 +1595,18 @@ CONFIG_IP_NF_MATCH_AH=m
15951595
CONFIG_IP_NF_MATCH_ECN=m
15961596
CONFIG_IP_NF_MATCH_RPFILTER=m
15971597
CONFIG_IP_NF_MATCH_TTL=m
1598-
CONFIG_IP_NF_FILTER=m
1598+
CONFIG_IP_NF_FILTER=y
15991599
CONFIG_IP_NF_TARGET_REJECT=m
16001600
CONFIG_IP_NF_TARGET_SYNPROXY=m
16011601
CONFIG_IP_NF_NAT=m
16021602
CONFIG_IP_NF_TARGET_MASQUERADE=m
16031603
CONFIG_IP_NF_TARGET_NETMAP=m
16041604
CONFIG_IP_NF_TARGET_REDIRECT=m
1605-
CONFIG_IP_NF_MANGLE=m
1605+
CONFIG_IP_NF_MANGLE=y
16061606
CONFIG_IP_NF_TARGET_ECN=m
16071607
CONFIG_IP_NF_TARGET_TTL=m
1608-
CONFIG_IP_NF_RAW=m
1609-
CONFIG_IP_NF_SECURITY=m
1608+
CONFIG_IP_NF_RAW=y
1609+
CONFIG_IP_NF_SECURITY=y
16101610
CONFIG_IP_NF_ARPTABLES=m
16111611
CONFIG_NFT_COMPAT_ARP=m
16121612
CONFIG_IP_NF_ARPFILTER=m
@@ -1616,7 +1616,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
16161616
#
16171617
# IPv6: Netfilter Configuration
16181618
#
1619-
CONFIG_IP6_NF_IPTABLES_LEGACY=m
1619+
CONFIG_IP6_NF_IPTABLES_LEGACY=y
16201620
CONFIG_NF_SOCKET_IPV6=m
16211621
CONFIG_NF_TPROXY_IPV6=m
16221622
CONFIG_NF_TABLES_IPV6=y
@@ -1638,11 +1638,11 @@ CONFIG_IP6_NF_MATCH_RPFILTER=m
16381638
CONFIG_IP6_NF_MATCH_RT=m
16391639
CONFIG_IP6_NF_MATCH_SRH=m
16401640
CONFIG_IP6_NF_TARGET_HL=m
1641-
CONFIG_IP6_NF_FILTER=m
1641+
CONFIG_IP6_NF_FILTER=y
16421642
CONFIG_IP6_NF_TARGET_REJECT=m
16431643
CONFIG_IP6_NF_TARGET_SYNPROXY=m
1644-
CONFIG_IP6_NF_MANGLE=m
1645-
CONFIG_IP6_NF_RAW=m
1644+
CONFIG_IP6_NF_MANGLE=y
1645+
CONFIG_IP6_NF_RAW=y
16461646
CONFIG_IP6_NF_SECURITY=m
16471647
CONFIG_IP6_NF_NAT=m
16481648
CONFIG_IP6_NF_TARGET_MASQUERADE=m

‎packages/kernel-6.12/config-full-bottlerocket-x86_64‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1597,7 +1597,7 @@ CONFIG_IP_VS_PE_SIP=m
15971597
# IP: Netfilter Configuration
15981598
#
15991599
CONFIG_NF_DEFRAG_IPV4=m
1600-
CONFIG_IP_NF_IPTABLES_LEGACY=m
1600+
CONFIG_IP_NF_IPTABLES_LEGACY=y
16011601
CONFIG_NF_SOCKET_IPV4=m
16021602
CONFIG_NF_TPROXY_IPV4=m
16031603
CONFIG_NF_TABLES_IPV4=y
@@ -1617,18 +1617,18 @@ CONFIG_IP_NF_MATCH_AH=m
16171617
CONFIG_IP_NF_MATCH_ECN=m
16181618
CONFIG_IP_NF_MATCH_RPFILTER=m
16191619
CONFIG_IP_NF_MATCH_TTL=m
1620-
CONFIG_IP_NF_FILTER=m
1620+
CONFIG_IP_NF_FILTER=y
16211621
CONFIG_IP_NF_TARGET_REJECT=m
16221622
CONFIG_IP_NF_TARGET_SYNPROXY=m
16231623
CONFIG_IP_NF_NAT=m
16241624
CONFIG_IP_NF_TARGET_MASQUERADE=m
16251625
CONFIG_IP_NF_TARGET_NETMAP=m
16261626
CONFIG_IP_NF_TARGET_REDIRECT=m
1627-
CONFIG_IP_NF_MANGLE=m
1627+
CONFIG_IP_NF_MANGLE=y
16281628
CONFIG_IP_NF_TARGET_ECN=m
16291629
CONFIG_IP_NF_TARGET_TTL=m
1630-
CONFIG_IP_NF_RAW=m
1631-
CONFIG_IP_NF_SECURITY=m
1630+
CONFIG_IP_NF_RAW=y
1631+
CONFIG_IP_NF_SECURITY=y
16321632
CONFIG_IP_NF_ARPTABLES=m
16331633
CONFIG_NFT_COMPAT_ARP=m
16341634
CONFIG_IP_NF_ARPFILTER=m
@@ -1638,7 +1638,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
16381638
#
16391639
# IPv6: Netfilter Configuration
16401640
#
1641-
CONFIG_IP6_NF_IPTABLES_LEGACY=m
1641+
CONFIG_IP6_NF_IPTABLES_LEGACY=y
16421642
CONFIG_NF_SOCKET_IPV6=m
16431643
CONFIG_NF_TPROXY_IPV6=m
16441644
CONFIG_NF_TABLES_IPV6=y
@@ -1660,11 +1660,11 @@ CONFIG_IP6_NF_MATCH_RPFILTER=m
16601660
CONFIG_IP6_NF_MATCH_RT=m
16611661
CONFIG_IP6_NF_MATCH_SRH=m
16621662
CONFIG_IP6_NF_TARGET_HL=m
1663-
CONFIG_IP6_NF_FILTER=m
1663+
CONFIG_IP6_NF_FILTER=y
16641664
CONFIG_IP6_NF_TARGET_REJECT=m
16651665
CONFIG_IP6_NF_TARGET_SYNPROXY=m
1666-
CONFIG_IP6_NF_MANGLE=m
1667-
CONFIG_IP6_NF_RAW=m
1666+
CONFIG_IP6_NF_MANGLE=y
1667+
CONFIG_IP6_NF_RAW=y
16681668
CONFIG_IP6_NF_SECURITY=m
16691669
CONFIG_IP6_NF_NAT=m
16701670
CONFIG_IP6_NF_TARGET_MASQUERADE=m

‎packages/kernel-6.12/kernel-6.12.spec‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1082,17 +1082,12 @@ install -p -m 0644 %{S:301} %{buildroot}%{_cross_bootconfigdir}/05-vmware.conf
10821082
%{_cross_kmoddir}/kernel/net/ipv4/netfilter/arp_tables.%{_ko}
10831083
%{_cross_kmoddir}/kernel/net/ipv4/netfilter/arpt_mangle.%{_ko}
10841084
%{_cross_kmoddir}/kernel/net/ipv4/netfilter/arptable_filter.%{_ko}
1085-
%{_cross_kmoddir}/kernel/net/ipv4/netfilter/ip_tables.%{_ko}
10861085
%{_cross_kmoddir}/kernel/net/ipv4/netfilter/ipt_ah.%{_ko}
10871086
%{_cross_kmoddir}/kernel/net/ipv4/netfilter/ipt_ECN.%{_ko}
10881087
%{_cross_kmoddir}/kernel/net/ipv4/netfilter/ipt_REJECT.%{_ko}
10891088
%{_cross_kmoddir}/kernel/net/ipv4/netfilter/ipt_rpfilter.%{_ko}
10901089
%{_cross_kmoddir}/kernel/net/ipv4/netfilter/ipt_SYNPROXY.%{_ko}
1091-
%{_cross_kmoddir}/kernel/net/ipv4/netfilter/iptable_filter.%{_ko}
1092-
%{_cross_kmoddir}/kernel/net/ipv4/netfilter/iptable_mangle.%{_ko}
10931090
%{_cross_kmoddir}/kernel/net/ipv4/netfilter/iptable_nat.%{_ko}
1094-
%{_cross_kmoddir}/kernel/net/ipv4/netfilter/iptable_raw.%{_ko}
1095-
%{_cross_kmoddir}/kernel/net/ipv4/netfilter/iptable_security.%{_ko}
10961091
%{_cross_kmoddir}/kernel/net/ipv4/netfilter/nf_defrag_ipv4.%{_ko}
10971092
%{_cross_kmoddir}/kernel/net/ipv4/netfilter/nf_dup_ipv4.%{_ko}
10981093
%{_cross_kmoddir}/kernel/net/ipv4/netfilter/nf_nat_h323.%{_ko}
@@ -1134,7 +1129,6 @@ install -p -m 0644 %{S:301} %{buildroot}%{_cross_bootconfigdir}/05-vmware.conf
11341129
%{_cross_kmoddir}/kernel/net/ipv6/ip6_vti.%{_ko}
11351130
%{_cross_kmoddir}/kernel/net/ipv6/ipcomp6.%{_ko}
11361131
%{_cross_kmoddir}/kernel/net/ipv6/mip6.%{_ko}
1137-
%{_cross_kmoddir}/kernel/net/ipv6/netfilter/ip6_tables.%{_ko}
11381132
%{_cross_kmoddir}/kernel/net/ipv6/netfilter/ip6t_ah.%{_ko}
11391133
%{_cross_kmoddir}/kernel/net/ipv6/netfilter/ip6t_eui64.%{_ko}
11401134
%{_cross_kmoddir}/kernel/net/ipv6/netfilter/ip6t_frag.%{_ko}
@@ -1146,10 +1140,7 @@ install -p -m 0644 %{S:301} %{buildroot}%{_cross_bootconfigdir}/05-vmware.conf
11461140
%{_cross_kmoddir}/kernel/net/ipv6/netfilter/ip6t_rt.%{_ko}
11471141
%{_cross_kmoddir}/kernel/net/ipv6/netfilter/ip6t_srh.%{_ko}
11481142
%{_cross_kmoddir}/kernel/net/ipv6/netfilter/ip6t_SYNPROXY.%{_ko}
1149-
%{_cross_kmoddir}/kernel/net/ipv6/netfilter/ip6table_filter.%{_ko}
1150-
%{_cross_kmoddir}/kernel/net/ipv6/netfilter/ip6table_mangle.%{_ko}
11511143
%{_cross_kmoddir}/kernel/net/ipv6/netfilter/ip6table_nat.%{_ko}
1152-
%{_cross_kmoddir}/kernel/net/ipv6/netfilter/ip6table_raw.%{_ko}
11531144
%{_cross_kmoddir}/kernel/net/ipv6/netfilter/ip6table_security.%{_ko}
11541145
%{_cross_kmoddir}/kernel/net/ipv6/netfilter/nf_defrag_ipv6.%{_ko}
11551146
%{_cross_kmoddir}/kernel/net/ipv6/netfilter/nf_dup_ipv6.%{_ko}

0 commit comments

Comments
 (0)