##// END OF EJS Templates
Merge branch 'ref+fix' of https://github.com/burnbabyburn/rpi23-gen-image into ref+fix
burnbabyburn -
r364:9d95bdd55d2c Fusion
parent child
Show More
@@ -116,76 +116,21 if [ "$BUILD_KERNEL" = true ] ; then
116 #See https://github.com/raspberrypi/linux/issues/2177#issuecomment-354647406
116 #See https://github.com/raspberrypi/linux/issues/2177#issuecomment-354647406
117 # Netfilter kernel support
117 # Netfilter kernel support
118 if [ "$KERNEL_NF" = true ] && ( [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ) ; then
118 if [ "$KERNEL_NF" = true ] && ( [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ) ; then
119 # xtables
120 set_kernel_config NETFILTER_XTABLES m
121 # Netfilter nf_tables support
122 set_kernel_config NF_TABLES m
123
124 set_kernel_config CONFIG_NETFILTER_XTABLES m
119 set_kernel_config CONFIG_NETFILTER_XTABLES m
125 set_kernel_config CONFIG_NF_TABLES_BRIDGE m
120 set_kernel_config CONFIG_NF_DUP_NETDEV m
126
127 set_kernel_config CONFIG_NF_NAT_SIP m
121 set_kernel_config CONFIG_NF_NAT_SIP m
128 set_kernel_config CONFIG_NF_NAT_TFTP m
129 set_kernel_config CONFIG_NF_NAT_REDIRECT m
130 set_kernel_config CONFIG_NF_TABLES_INET m
131 set_kernel_config CONFIG_NF_TABLES_NETDEV m
132 set_kernel_config CONFIG_NF_TABLES_ARP m
122 set_kernel_config CONFIG_NF_TABLES_ARP m
133 set_kernel_config CONFIG_NF_DUP_IPV4 m
123 set_kernel_config CONFIG_NF_TABLES_BRIDGE m
134 set_kernel_config CONFIG_NF_LOG_IPV4 m
124 set_kernel_config NF_TABLES m
135 set_kernel_config CONFIG_NF_REJECT_IPV4 m
125 set_kernel_config CONFIG_BRIDGE_EBT_BROUTE m
136 set_kernel_config CONFIG_NF_NAT_IPV4 m
126 set_kernel_config CONFIG_BRIDGE_EBT_T_FILTER m
137 set_kernel_config CONFIG_NF_DUP_NETDEV m
127 set_kernel_config CONFIG_BRIDGE_NF_EBTABLES m
138 set_kernel_config CONFIG_NF_DEFRAG_IPV4 m
128 set_kernel_config CONFIG_IP6_NF_IPTABLES m
139 set_kernel_config CONFIG_NF_CONNTRACK_IPV4 m
129 set_kernel_config CONFIG_IP6_NF_MATCH_AH m
140 set_kernel_config CONFIG_NF_TABLES_IPV4 m
130 set_kernel_config CONFIG_IP6_NF_MATCH_EUI64 m
141 set_kernel_config CONFIG_NF_NAT_MASQUERADE_IPV4 m
131 set_kernel_config CONFIG_IP6_NF_NAT m
142 set_kernel_config CONFIG_NF_NAT_SNMP_BASIC m
132 set_kernel_config CONFIG_IP6_NF_TARGET_MASQUERADE m
143 set_kernel_config CONFIG_NF_NAT_PROTO_GRE m
133 set_kernel_config CONFIG_IP6_NF_TARGET_NPT m
144 set_kernel_config CONFIG_NF_NAT_PPTP m
145 set_kernel_config CONFIG_NF_DEFRAG_IPV6 m
146 set_kernel_config CONFIG_NF_CONNTRACK_IPV6 m
147 set_kernel_config CONFIG_NF_TABLES_IPV6 m
148 set_kernel_config CONFIG_NF_DUP_IPV6 m
149 set_kernel_config CONFIG_NF_REJECT_IPV6 m
150 set_kernel_config CONFIG_NF_LOG_IPV6 m
151 set_kernel_config CONFIG_NF_NAT_IPV6 m
152 set_kernel_config CONFIG_NF_NAT_MASQUERADE_IPV6 m
153
154 set_kernel_config CONFIG_NFT_EXTHDR m
155 set_kernel_config CONFIG_NFT_META m
156 set_kernel_config CONFIG_NFT_NUMGEN m
157 set_kernel_config CONFIG_NFT_CT m
158 set_kernel_config CONFIG_NFT_SET_RBTREE m
159 set_kernel_config CONFIG_NFT_SET_HASH m
160 set_kernel_config CONFIG_NFT_COUNTER m
161 set_kernel_config CONFIG_NFT_LOG m
162 set_kernel_config CONFIG_NFT_LIMIT m
163 set_kernel_config CONFIG_NFT_MASQ m
164 set_kernel_config CONFIG_NFT_REDIR m
165 set_kernel_config CONFIG_NFT_NAT m
166 set_kernel_config CONFIG_NFT_QUEUE m
167 set_kernel_config CONFIG_NFT_QUOTA m
168 set_kernel_config CONFIG_NFT_REJECT m
169 set_kernel_config CONFIG_NFT_REJECT_INET m
170 set_kernel_config CONFIG_NFT_COMPAT m
171 set_kernel_config CONFIG_NFT_HASH m
172 set_kernel_config CONFIG_NFT_DUP_NETDEV m
173 set_kernel_config CONFIG_NFT_FWD_NETDEV m
174 set_kernel_config CONFIG_NFT_CHAIN_ROUTE_IPV4 m
175 set_kernel_config CONFIG_NFT_REJECT_IPV4 m
176 set_kernel_config CONFIG_NFT_DUP_IPV4 m
177 set_kernel_config CONFIG_NFT_CHAIN_NAT_IPV4 m
178 set_kernel_config CONFIG_NFT_MASQ_IPV4 m
179 set_kernel_config CONFIG_NFT_REDIR_IPV4 m
180 set_kernel_config CONFIG_NFT_CHAIN_ROUTE_IPV6 m
181 set_kernel_config CONFIG_NFT_REJECT_IPV6 m
182 set_kernel_config CONFIG_NFT_DUP_IPV6 m
183 set_kernel_config CONFIG_NFT_CHAIN_NAT_IPV6 m
184 set_kernel_config CONFIG_NFT_MASQ_IPV6 m
185 set_kernel_config CONFIG_NFT_REDIR_IPV6 m
186 set_kernel_config CONFIG_NFT_BRIDGE_META m
187 set_kernel_config CONFIG_NFT_BRIDGE_REJECT m
188
189 set_kernel_config CONFIG_IP_SET_BITMAP_IPMAC m
134 set_kernel_config CONFIG_IP_SET_BITMAP_IPMAC m
190 set_kernel_config CONFIG_IP_SET_BITMAP_PORT m
135 set_kernel_config CONFIG_IP_SET_BITMAP_PORT m
191 set_kernel_config CONFIG_IP_SET_HASH_IP m
136 set_kernel_config CONFIG_IP_SET_HASH_IP m
@@ -194,24 +139,71 if [ "$BUILD_KERNEL" = true ] ; then
194 set_kernel_config CONFIG_IP_SET_HASH_IPPORTIP m
139 set_kernel_config CONFIG_IP_SET_HASH_IPPORTIP m
195 set_kernel_config CONFIG_IP_SET_HASH_IPPORTNET m
140 set_kernel_config CONFIG_IP_SET_HASH_IPPORTNET m
196 set_kernel_config CONFIG_IP_SET_HASH_MAC m
141 set_kernel_config CONFIG_IP_SET_HASH_MAC m
197 set_kernel_config CONFIG_IP_SET_HASH_NETPORTNET m
198 set_kernel_config CONFIG_IP_SET_HASH_NET m
142 set_kernel_config CONFIG_IP_SET_HASH_NET m
143 set_kernel_config CONFIG_IP_SET_HASH_NETIFACE m
199 set_kernel_config CONFIG_IP_SET_HASH_NETNET m
144 set_kernel_config CONFIG_IP_SET_HASH_NETNET m
200 set_kernel_config CONFIG_IP_SET_HASH_NETPORT m
145 set_kernel_config CONFIG_IP_SET_HASH_NETPORT m
201 set_kernel_config CONFIG_IP_SET_HASH_NETIFACE m
146 set_kernel_config CONFIG_IP_SET_HASH_NETPORTNET m
202 set_kernel_config CONFIG_IP_SET_LIST_SET m
147 set_kernel_config CONFIG_IP_SET_LIST_SET m
203
148 set_kernel_config CONFIG_NFT_BRIDGE_META m
204 set_kernel_config CONFIG_IP6_NF_IPTABLES m
149 set_kernel_config CONFIG_NFT_BRIDGE_REJECT m
205 set_kernel_config CONFIG_IP6_NF_MATCH_AH m
150 set_kernel_config CONFIG_NFT_CHAIN_NAT_IPV4 m
206 set_kernel_config CONFIG_IP6_NF_MATCH_EUI64 m
151 set_kernel_config CONFIG_NFT_CHAIN_NAT_IPV6 m
207 set_kernel_config CONFIG_IP6_NF_NAT m
152 set_kernel_config CONFIG_NFT_CHAIN_ROUTE_IPV4 m
208 set_kernel_config CONFIG_IP6_NF_TARGET_MASQUERADE m
153 set_kernel_config CONFIG_NFT_CHAIN_ROUTE_IPV6 m
209 set_kernel_config CONFIG_IP6_NF_TARGET_NPT m
154 set_kernel_config CONFIG_NFT_COMPAT m
210
155 set_kernel_config CONFIG_NFT_COUNTER m
156 set_kernel_config CONFIG_NFT_CT m
157 set_kernel_config CONFIG_NFT_DUP_IPV4 m
158 set_kernel_config CONFIG_NFT_DUP_IPV6 m
159 set_kernel_config CONFIG_NFT_DUP_NETDEV m
160 set_kernel_config CONFIG_NFT_EXTHDR m
161 set_kernel_config CONFIG_NFT_FWD_NETDEV m
162 set_kernel_config CONFIG_NFT_HASH m
163 set_kernel_config CONFIG_NFT_LIMIT m
164 set_kernel_config CONFIG_NFT_LOG m
165 set_kernel_config CONFIG_NFT_MASQ m
166 set_kernel_config CONFIG_NFT_MASQ_IPV4 m
167 set_kernel_config CONFIG_NFT_MASQ_IPV6 m
168 set_kernel_config CONFIG_NFT_META m
169 set_kernel_config CONFIG_NFT_NAT m
170 set_kernel_config CONFIG_NFT_NUMGEN m
171 set_kernel_config CONFIG_NFT_QUEUE m
172 set_kernel_config CONFIG_NFT_QUOTA m
173 set_kernel_config CONFIG_NFT_REDIR m
174 set_kernel_config CONFIG_NFT_REDIR_IPV4 m
175 set_kernel_config CONFIG_NFT_REDIR_IPV6 m
176 set_kernel_config CONFIG_NFT_REJECT m
177 set_kernel_config CONFIG_NFT_REJECT_INET m
178 set_kernel_config CONFIG_NFT_REJECT_IPV4 m
179 set_kernel_config CONFIG_NFT_REJECT_IPV6 m
180 set_kernel_config CONFIG_NFT_SET_HASH m
181 set_kernel_config CONFIG_NFT_SET_RBTREE m
182 set_kernel_config CONFIG_NF_CONNTRACK_IPV4 m
183 set_kernel_config CONFIG_NF_CONNTRACK_IPV6 m
184 set_kernel_config CONFIG_NF_DEFRAG_IPV4 m
185 set_kernel_config CONFIG_NF_DEFRAG_IPV6 m
186 set_kernel_config CONFIG_NF_DUP_IPV4 m
187 set_kernel_config CONFIG_NF_DUP_IPV6 m
211 set_kernel_config CONFIG_NF_LOG_BRIDGE m
188 set_kernel_config CONFIG_NF_LOG_BRIDGE m
212 set_kernel_config CONFIG_BRIDGE_NF_EBTABLES m
189 set_kernel_config CONFIG_NF_LOG_IPV4 m
213 set_kernel_config CONFIG_BRIDGE_EBT_BROUTE m
190 set_kernel_config CONFIG_NF_LOG_IPV6 m
214 set_kernel_config CONFIG_BRIDGE_EBT_T_FILTER m
191 set_kernel_config CONFIG_NF_NAT_IPV4 m
192 set_kernel_config CONFIG_NF_NAT_IPV6 m
193 set_kernel_config CONFIG_NF_NAT_MASQUERADE_IPV4 m
194 set_kernel_config CONFIG_NF_NAT_MASQUERADE_IPV6 m
195 set_kernel_config CONFIG_NF_NAT_PPTP m
196 set_kernel_config CONFIG_NF_NAT_PROTO_GRE m
197 set_kernel_config CONFIG_NF_NAT_REDIRECT m
198 set_kernel_config CONFIG_NF_NAT_SNMP_BASIC m
199 set_kernel_config CONFIG_NF_NAT_TFTP m
200 set_kernel_config CONFIG_NF_REJECT_IPV4 m
201 set_kernel_config CONFIG_NF_REJECT_IPV6 m
202 set_kernel_config CONFIG_NF_TABLES_INET m
203 set_kernel_config CONFIG_NF_TABLES_IPV4 m
204 set_kernel_config CONFIG_NF_TABLES_IPV6 m
205 set_kernel_config CONFIG_NF_TABLES_NETDEV m
206 set_kernel_config NETFILTER_XTABLES m
215 fi
207 fi
216
208
217 #https://groups.google.com/forum/#!topic/linux.gentoo.user/_2aSc_ztGpA
209 #https://groups.google.com/forum/#!topic/linux.gentoo.user/_2aSc_ztGpA
General Comments 0
Vous devez vous connecter pour laisser un commentaire. Se connecter maintenant