Skip to content

Commit 877341e

Browse files
Mic92Mic92
authored
Merge pull request #192190 from yu-re-ka/lkl-with-firewall
lklWithFirewall: init
2 parents a31e666 + 502c8c1 commit 877341e

File tree

3 files changed

+162
-1
lines changed

3 files changed

+162
-1
lines changed

‎pkgs/applications/virtualization/lkl/default.nix‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
{ lib, stdenv, fetchFromGitHub, bc, python3, bison, flex, fuse, libarchive
2-
, buildPackages }:
2+
, buildPackages
3+
4+
, firewallSupport ? false
5+
}:
36

47
stdenv.mkDerivation rec {
58
pname = "lkl";
@@ -26,6 +29,8 @@ stdenv.mkDerivation rec {
2629
2730
# Fixup build with newer Linux headers: https://github.com/lkl/linux/pull/484
2831
sed '1i#include <linux/sockios.h>' -i tools/lkl/lib/hijack/xlate.c
32+
'' + lib.optionalString firewallSupport ''
33+
cat ${./lkl-defconfig-enable-nftables} >> arch/lkl/configs/defconfig
2934
'';
3035

3136
installPhase = ''

‎pkgs/applications/virtualization/lkl/lkl-defconfig-enable-nftables‎

Lines changed: 155 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,155 @@
1+
CONFIG_NETFILTER=y
2+
CONFIG_NF_CONNTRACK=y
3+
CONFIG_NF_LOG_NETDEV=y
4+
CONFIG_NF_CONNTRACK_ZONES=y
5+
CONFIG_NF_CONNTRACK_EVENTS=y
6+
CONFIG_NF_CONNTRACK_TIMEOUT=y
7+
CONFIG_NF_CONNTRACK_TIMESTAMP=y
8+
CONFIG_NF_CONNTRACK_AMANDA=y
9+
CONFIG_NF_CONNTRACK_FTP=y
10+
CONFIG_NF_CONNTRACK_H323=y
11+
CONFIG_NF_CONNTRACK_IRC=y
12+
CONFIG_NF_CONNTRACK_NETBIOS_NS=y
13+
CONFIG_NF_CONNTRACK_SNMP=y
14+
CONFIG_NF_CONNTRACK_PPTP=y
15+
CONFIG_NF_CONNTRACK_SANE=y
16+
CONFIG_NF_CONNTRACK_SIP=y
17+
CONFIG_NF_CONNTRACK_TFTP=y
18+
CONFIG_NF_CT_NETLINK=y
19+
CONFIG_NF_CT_NETLINK_TIMEOUT=y
20+
CONFIG_NF_CT_NETLINK_HELPER=y
21+
CONFIG_NETFILTER_NETLINK_GLUE_CT=y
22+
CONFIG_NF_TABLES=y
23+
CONFIG_NF_TABLES_INET=y
24+
CONFIG_NF_TABLES_NETDEV=y
25+
CONFIG_NFT_NUMGEN=y
26+
CONFIG_NFT_CT=y
27+
CONFIG_NFT_COUNTER=y
28+
CONFIG_NFT_CONNLIMIT=y
29+
CONFIG_NFT_LOG=y
30+
CONFIG_NFT_LIMIT=y
31+
CONFIG_NFT_MASQ=y
32+
CONFIG_NFT_REDIR=y
33+
CONFIG_NFT_NAT=y
34+
CONFIG_NFT_TUNNEL=y
35+
CONFIG_NFT_OBJREF=y
36+
CONFIG_NFT_QUEUE=y
37+
CONFIG_NFT_QUOTA=y
38+
CONFIG_NFT_REJECT=y
39+
CONFIG_NFT_COMPAT=y
40+
CONFIG_NFT_HASH=y
41+
CONFIG_NFT_FIB_INET=y
42+
CONFIG_NFT_SOCKET=y
43+
CONFIG_NFT_OSF=y
44+
CONFIG_NFT_TPROXY=y
45+
CONFIG_NFT_SYNPROXY=y
46+
CONFIG_NFT_DUP_NETDEV=y
47+
CONFIG_NFT_FWD_NETDEV=y
48+
CONFIG_NFT_FIB_NETDEV=y
49+
CONFIG_NF_FLOW_TABLE_INET=y
50+
CONFIG_NF_FLOW_TABLE=y
51+
CONFIG_NETFILTER_XT_TARGET_CHECKSUM=y
52+
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
53+
CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
54+
CONFIG_NETFILTER_XT_TARGET_DSCP=y
55+
CONFIG_NETFILTER_XT_TARGET_HMARK=y
56+
CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y
57+
CONFIG_NETFILTER_XT_TARGET_LOG=y
58+
CONFIG_NETFILTER_XT_TARGET_MARK=y
59+
CONFIG_NETFILTER_XT_TARGET_NFLOG=y
60+
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
61+
CONFIG_NETFILTER_XT_TARGET_NOTRACK=y
62+
CONFIG_NETFILTER_XT_TARGET_TEE=y
63+
CONFIG_NETFILTER_XT_TARGET_TPROXY=y
64+
CONFIG_NETFILTER_XT_TARGET_TRACE=y
65+
CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
66+
CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=y
67+
CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y
68+
CONFIG_NETFILTER_XT_MATCH_BPF=y
69+
CONFIG_NETFILTER_XT_MATCH_CLUSTER=y
70+
CONFIG_NETFILTER_XT_MATCH_COMMENT=y
71+
CONFIG_NETFILTER_XT_MATCH_CONNBYTES=y
72+
CONFIG_NETFILTER_XT_MATCH_CONNLABEL=y
73+
CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y
74+
CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
75+
CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
76+
CONFIG_NETFILTER_XT_MATCH_CPU=y
77+
CONFIG_NETFILTER_XT_MATCH_DCCP=y
78+
CONFIG_NETFILTER_XT_MATCH_DEVGROUP=y
79+
CONFIG_NETFILTER_XT_MATCH_DSCP=y
80+
CONFIG_NETFILTER_XT_MATCH_ESP=y
81+
CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y
82+
CONFIG_NETFILTER_XT_MATCH_HELPER=y
83+
CONFIG_NETFILTER_XT_MATCH_IPCOMP=y
84+
CONFIG_NETFILTER_XT_MATCH_IPRANGE=y
85+
CONFIG_NETFILTER_XT_MATCH_L2TP=y
86+
CONFIG_NETFILTER_XT_MATCH_LENGTH=y
87+
CONFIG_NETFILTER_XT_MATCH_LIMIT=y
88+
CONFIG_NETFILTER_XT_MATCH_MAC=y
89+
CONFIG_NETFILTER_XT_MATCH_MARK=y
90+
CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y
91+
CONFIG_NETFILTER_XT_MATCH_NFACCT=y
92+
CONFIG_NETFILTER_XT_MATCH_OSF=y
93+
CONFIG_NETFILTER_XT_MATCH_OWNER=y
94+
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
95+
CONFIG_NETFILTER_XT_MATCH_QUOTA=y
96+
CONFIG_NETFILTER_XT_MATCH_RATEEST=y
97+
CONFIG_NETFILTER_XT_MATCH_REALM=y
98+
CONFIG_NETFILTER_XT_MATCH_RECENT=y
99+
CONFIG_NETFILTER_XT_MATCH_SCTP=y
100+
CONFIG_NETFILTER_XT_MATCH_SOCKET=y
101+
CONFIG_NETFILTER_XT_MATCH_STATE=y
102+
CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
103+
CONFIG_NETFILTER_XT_MATCH_STRING=y
104+
CONFIG_NETFILTER_XT_MATCH_TCPMSS=y
105+
CONFIG_NETFILTER_XT_MATCH_TIME=y
106+
CONFIG_NETFILTER_XT_MATCH_U32=y
107+
CONFIG_NFT_DUP_IPV4=y
108+
CONFIG_NFT_FIB_IPV4=y
109+
CONFIG_NF_TABLES_ARP=y
110+
CONFIG_NF_FLOW_TABLE_IPV4=y
111+
CONFIG_NF_LOG_ARP=y
112+
CONFIG_IP_NF_IPTABLES=y
113+
CONFIG_IP_NF_MATCH_AH=y
114+
CONFIG_IP_NF_MATCH_ECN=y
115+
CONFIG_IP_NF_MATCH_RPFILTER=y
116+
CONFIG_IP_NF_MATCH_TTL=y
117+
CONFIG_IP_NF_FILTER=y
118+
CONFIG_IP_NF_TARGET_REJECT=y
119+
CONFIG_IP_NF_TARGET_SYNPROXY=y
120+
CONFIG_IP_NF_NAT=y
121+
CONFIG_IP_NF_TARGET_MASQUERADE=y
122+
CONFIG_IP_NF_TARGET_NETMAP=y
123+
CONFIG_IP_NF_TARGET_REDIRECT=y
124+
CONFIG_IP_NF_MANGLE=y
125+
CONFIG_IP_NF_TARGET_CLUSTERIP=y
126+
CONFIG_IP_NF_TARGET_ECN=y
127+
CONFIG_IP_NF_TARGET_TTL=y
128+
CONFIG_IP_NF_RAW=y
129+
CONFIG_IP_NF_ARPTABLES=y
130+
CONFIG_IP_NF_ARPFILTER=y
131+
CONFIG_IP_NF_ARP_MANGLE=y
132+
CONFIG_NFT_DUP_IPV6=y
133+
CONFIG_NFT_FIB_IPV6=y
134+
CONFIG_NF_FLOW_TABLE_IPV6=y
135+
CONFIG_IP6_NF_IPTABLES=y
136+
CONFIG_IP6_NF_MATCH_AH=y
137+
CONFIG_IP6_NF_MATCH_EUI64=y
138+
CONFIG_IP6_NF_MATCH_FRAG=y
139+
CONFIG_IP6_NF_MATCH_OPTS=y
140+
CONFIG_IP6_NF_MATCH_HL=y
141+
CONFIG_IP6_NF_MATCH_IPV6HEADER=y
142+
CONFIG_IP6_NF_MATCH_MH=y
143+
CONFIG_IP6_NF_MATCH_RPFILTER=y
144+
CONFIG_IP6_NF_MATCH_RT=y
145+
CONFIG_IP6_NF_MATCH_SRH=y
146+
CONFIG_IP6_NF_TARGET_HL=y
147+
CONFIG_IP6_NF_FILTER=y
148+
CONFIG_IP6_NF_TARGET_REJECT=y
149+
CONFIG_IP6_NF_TARGET_SYNPROXY=y
150+
CONFIG_IP6_NF_MANGLE=y
151+
CONFIG_IP6_NF_RAW=y
152+
CONFIG_IP6_NF_NAT=y
153+
CONFIG_IP6_NF_TARGET_MASQUERADE=y
154+
CONFIG_IP6_NF_TARGET_NPT=y
155+
CONFIG_NF_CONNTRACK_BRIDGE=y

‎pkgs/top-level/all-packages.nix‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24610,6 +24610,7 @@ with pkgs;
2461024610
tgt = callPackage ../tools/networking/tgt { };
2461124611

2461224612
lkl = callPackage ../applications/virtualization/lkl { };
24613+
lklWithFirewall = callPackage ../applications/virtualization/lkl { firewallSupport = true; };
2461324614

2461424615
inherit (callPackages ../os-specific/linux/kernel-headers { })
2461524616
linuxHeaders makeLinuxHeaders;

0 commit comments

Comments
 (0)