From 9d95bdd55d2c18439bc469fa6c126e3668608777 2018-11-19 13:32:27 From: burnbabyburn Date: 2018-11-19 13:32:27 Subject: [PATCH] Merge branch 'ref+fix' of https://github.com/burnbabyburn/rpi23-gen-image into ref+fix --- diff --git a/bootstrap.d/13-kernel.sh b/bootstrap.d/13-kernel.sh index 5936710..34e93e4 100644 --- a/bootstrap.d/13-kernel.sh +++ b/bootstrap.d/13-kernel.sh @@ -116,76 +116,21 @@ if [ "$BUILD_KERNEL" = true ] ; then #See https://github.com/raspberrypi/linux/issues/2177#issuecomment-354647406 # Netfilter kernel support if [ "$KERNEL_NF" = true ] && ( [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ) ; then - # xtables - set_kernel_config NETFILTER_XTABLES m - # Netfilter nf_tables support - set_kernel_config NF_TABLES m - set_kernel_config CONFIG_NETFILTER_XTABLES m - set_kernel_config CONFIG_NF_TABLES_BRIDGE m - + set_kernel_config CONFIG_NF_DUP_NETDEV m set_kernel_config CONFIG_NF_NAT_SIP m - set_kernel_config CONFIG_NF_NAT_TFTP m - set_kernel_config CONFIG_NF_NAT_REDIRECT m - set_kernel_config CONFIG_NF_TABLES_INET m - set_kernel_config CONFIG_NF_TABLES_NETDEV m set_kernel_config CONFIG_NF_TABLES_ARP m - set_kernel_config CONFIG_NF_DUP_IPV4 m - set_kernel_config CONFIG_NF_LOG_IPV4 m - set_kernel_config CONFIG_NF_REJECT_IPV4 m - set_kernel_config CONFIG_NF_NAT_IPV4 m - set_kernel_config CONFIG_NF_DUP_NETDEV m - set_kernel_config CONFIG_NF_DEFRAG_IPV4 m - set_kernel_config CONFIG_NF_CONNTRACK_IPV4 m - set_kernel_config CONFIG_NF_TABLES_IPV4 m - set_kernel_config CONFIG_NF_NAT_MASQUERADE_IPV4 m - set_kernel_config CONFIG_NF_NAT_SNMP_BASIC m - set_kernel_config CONFIG_NF_NAT_PROTO_GRE m - set_kernel_config CONFIG_NF_NAT_PPTP m - set_kernel_config CONFIG_NF_DEFRAG_IPV6 m - set_kernel_config CONFIG_NF_CONNTRACK_IPV6 m - set_kernel_config CONFIG_NF_TABLES_IPV6 m - set_kernel_config CONFIG_NF_DUP_IPV6 m - set_kernel_config CONFIG_NF_REJECT_IPV6 m - set_kernel_config CONFIG_NF_LOG_IPV6 m - set_kernel_config CONFIG_NF_NAT_IPV6 m - set_kernel_config CONFIG_NF_NAT_MASQUERADE_IPV6 m - - set_kernel_config CONFIG_NFT_EXTHDR m - set_kernel_config CONFIG_NFT_META m - set_kernel_config CONFIG_NFT_NUMGEN m - set_kernel_config CONFIG_NFT_CT m - set_kernel_config CONFIG_NFT_SET_RBTREE m - set_kernel_config CONFIG_NFT_SET_HASH m - set_kernel_config CONFIG_NFT_COUNTER m - set_kernel_config CONFIG_NFT_LOG m - set_kernel_config CONFIG_NFT_LIMIT m - set_kernel_config CONFIG_NFT_MASQ m - set_kernel_config CONFIG_NFT_REDIR m - set_kernel_config CONFIG_NFT_NAT m - set_kernel_config CONFIG_NFT_QUEUE m - set_kernel_config CONFIG_NFT_QUOTA m - set_kernel_config CONFIG_NFT_REJECT m - set_kernel_config CONFIG_NFT_REJECT_INET m - set_kernel_config CONFIG_NFT_COMPAT m - set_kernel_config CONFIG_NFT_HASH m - set_kernel_config CONFIG_NFT_DUP_NETDEV m - set_kernel_config CONFIG_NFT_FWD_NETDEV m - set_kernel_config CONFIG_NFT_CHAIN_ROUTE_IPV4 m - set_kernel_config CONFIG_NFT_REJECT_IPV4 m - set_kernel_config CONFIG_NFT_DUP_IPV4 m - set_kernel_config CONFIG_NFT_CHAIN_NAT_IPV4 m - set_kernel_config CONFIG_NFT_MASQ_IPV4 m - set_kernel_config CONFIG_NFT_REDIR_IPV4 m - set_kernel_config CONFIG_NFT_CHAIN_ROUTE_IPV6 m - set_kernel_config CONFIG_NFT_REJECT_IPV6 m - set_kernel_config CONFIG_NFT_DUP_IPV6 m - set_kernel_config CONFIG_NFT_CHAIN_NAT_IPV6 m - set_kernel_config CONFIG_NFT_MASQ_IPV6 m - set_kernel_config CONFIG_NFT_REDIR_IPV6 m - set_kernel_config CONFIG_NFT_BRIDGE_META m - set_kernel_config CONFIG_NFT_BRIDGE_REJECT m - + set_kernel_config CONFIG_NF_TABLES_BRIDGE m + set_kernel_config NF_TABLES m + set_kernel_config CONFIG_BRIDGE_EBT_BROUTE m + set_kernel_config CONFIG_BRIDGE_EBT_T_FILTER m + set_kernel_config CONFIG_BRIDGE_NF_EBTABLES m + set_kernel_config CONFIG_IP6_NF_IPTABLES m + set_kernel_config CONFIG_IP6_NF_MATCH_AH m + set_kernel_config CONFIG_IP6_NF_MATCH_EUI64 m + set_kernel_config CONFIG_IP6_NF_NAT m + set_kernel_config CONFIG_IP6_NF_TARGET_MASQUERADE m + set_kernel_config CONFIG_IP6_NF_TARGET_NPT m set_kernel_config CONFIG_IP_SET_BITMAP_IPMAC m set_kernel_config CONFIG_IP_SET_BITMAP_PORT m set_kernel_config CONFIG_IP_SET_HASH_IP m @@ -194,24 +139,71 @@ if [ "$BUILD_KERNEL" = true ] ; then set_kernel_config CONFIG_IP_SET_HASH_IPPORTIP m set_kernel_config CONFIG_IP_SET_HASH_IPPORTNET m set_kernel_config CONFIG_IP_SET_HASH_MAC m - set_kernel_config CONFIG_IP_SET_HASH_NETPORTNET m set_kernel_config CONFIG_IP_SET_HASH_NET m + set_kernel_config CONFIG_IP_SET_HASH_NETIFACE m set_kernel_config CONFIG_IP_SET_HASH_NETNET m set_kernel_config CONFIG_IP_SET_HASH_NETPORT m - set_kernel_config CONFIG_IP_SET_HASH_NETIFACE m + set_kernel_config CONFIG_IP_SET_HASH_NETPORTNET m set_kernel_config CONFIG_IP_SET_LIST_SET m - - set_kernel_config CONFIG_IP6_NF_IPTABLES m - set_kernel_config CONFIG_IP6_NF_MATCH_AH m - set_kernel_config CONFIG_IP6_NF_MATCH_EUI64 m - set_kernel_config CONFIG_IP6_NF_NAT m - set_kernel_config CONFIG_IP6_NF_TARGET_MASQUERADE m - set_kernel_config CONFIG_IP6_NF_TARGET_NPT m - + set_kernel_config CONFIG_NFT_BRIDGE_META m + set_kernel_config CONFIG_NFT_BRIDGE_REJECT m + set_kernel_config CONFIG_NFT_CHAIN_NAT_IPV4 m + set_kernel_config CONFIG_NFT_CHAIN_NAT_IPV6 m + set_kernel_config CONFIG_NFT_CHAIN_ROUTE_IPV4 m + set_kernel_config CONFIG_NFT_CHAIN_ROUTE_IPV6 m + set_kernel_config CONFIG_NFT_COMPAT m + set_kernel_config CONFIG_NFT_COUNTER m + set_kernel_config CONFIG_NFT_CT m + set_kernel_config CONFIG_NFT_DUP_IPV4 m + set_kernel_config CONFIG_NFT_DUP_IPV6 m + set_kernel_config CONFIG_NFT_DUP_NETDEV m + set_kernel_config CONFIG_NFT_EXTHDR m + set_kernel_config CONFIG_NFT_FWD_NETDEV m + set_kernel_config CONFIG_NFT_HASH m + set_kernel_config CONFIG_NFT_LIMIT m + set_kernel_config CONFIG_NFT_LOG m + set_kernel_config CONFIG_NFT_MASQ m + set_kernel_config CONFIG_NFT_MASQ_IPV4 m + set_kernel_config CONFIG_NFT_MASQ_IPV6 m + set_kernel_config CONFIG_NFT_META m + set_kernel_config CONFIG_NFT_NAT m + set_kernel_config CONFIG_NFT_NUMGEN m + set_kernel_config CONFIG_NFT_QUEUE m + set_kernel_config CONFIG_NFT_QUOTA m + set_kernel_config CONFIG_NFT_REDIR m + set_kernel_config CONFIG_NFT_REDIR_IPV4 m + set_kernel_config CONFIG_NFT_REDIR_IPV6 m + set_kernel_config CONFIG_NFT_REJECT m + set_kernel_config CONFIG_NFT_REJECT_INET m + set_kernel_config CONFIG_NFT_REJECT_IPV4 m + set_kernel_config CONFIG_NFT_REJECT_IPV6 m + set_kernel_config CONFIG_NFT_SET_HASH m + set_kernel_config CONFIG_NFT_SET_RBTREE m + set_kernel_config CONFIG_NF_CONNTRACK_IPV4 m + set_kernel_config CONFIG_NF_CONNTRACK_IPV6 m + set_kernel_config CONFIG_NF_DEFRAG_IPV4 m + set_kernel_config CONFIG_NF_DEFRAG_IPV6 m + set_kernel_config CONFIG_NF_DUP_IPV4 m + set_kernel_config CONFIG_NF_DUP_IPV6 m set_kernel_config CONFIG_NF_LOG_BRIDGE m - set_kernel_config CONFIG_BRIDGE_NF_EBTABLES m - set_kernel_config CONFIG_BRIDGE_EBT_BROUTE m - set_kernel_config CONFIG_BRIDGE_EBT_T_FILTER m + set_kernel_config CONFIG_NF_LOG_IPV4 m + set_kernel_config CONFIG_NF_LOG_IPV6 m + set_kernel_config CONFIG_NF_NAT_IPV4 m + set_kernel_config CONFIG_NF_NAT_IPV6 m + set_kernel_config CONFIG_NF_NAT_MASQUERADE_IPV4 m + set_kernel_config CONFIG_NF_NAT_MASQUERADE_IPV6 m + set_kernel_config CONFIG_NF_NAT_PPTP m + set_kernel_config CONFIG_NF_NAT_PROTO_GRE m + set_kernel_config CONFIG_NF_NAT_REDIRECT m + set_kernel_config CONFIG_NF_NAT_SNMP_BASIC m + set_kernel_config CONFIG_NF_NAT_TFTP m + set_kernel_config CONFIG_NF_REJECT_IPV4 m + set_kernel_config CONFIG_NF_REJECT_IPV6 m + set_kernel_config CONFIG_NF_TABLES_INET m + set_kernel_config CONFIG_NF_TABLES_IPV4 m + set_kernel_config CONFIG_NF_TABLES_IPV6 m + set_kernel_config CONFIG_NF_TABLES_NETDEV m + set_kernel_config NETFILTER_XTABLES m fi #https://groups.google.com/forum/#!topic/linux.gentoo.user/_2aSc_ztGpA