From ceca037d05faee05f4286b5e00e40936744a8236 Mon Sep 17 00:00:00 2001 From: Alexander Morozov Date: Fri, 22 May 2015 10:41:26 -0700 Subject: [PATCH 1/2] Add optional CONFIG_BLK_CGROUP and CONFIG_IOSCHED_CFQ to check-config.sh It is needed for blkio.weight support Signed-off-by: Alexander Morozov --- contrib/check-config.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/check-config.sh b/contrib/check-config.sh index 9021ec56fa..3c54ae4e52 100755 --- a/contrib/check-config.sh +++ b/contrib/check-config.sh @@ -184,6 +184,8 @@ echo 'Optional Features:' } flags=( RESOURCE_COUNTERS + BLK_CGROUP + IOSCHED_CFQ CGROUP_PERF CFS_BANDWIDTH ) From 6cc4cf7c0cc8ae56974f16b3b2053c82be722349 Mon Sep 17 00:00:00 2001 From: Alexander Morozov Date: Fri, 22 May 2015 10:46:53 -0700 Subject: [PATCH 2/2] Add BRIDGE_NETFILTER to check-config.sh It is needed to use network with --userland-proxy=false and for --icc=false Signed-off-by: Alexander Morozov --- contrib/check-config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/check-config.sh b/contrib/check-config.sh index 3c54ae4e52..1482777f1a 100755 --- a/contrib/check-config.sh +++ b/contrib/check-config.sh @@ -163,7 +163,7 @@ flags=( NAMESPACES {NET,PID,IPC,UTS}_NS DEVPTS_MULTIPLE_INSTANCES CGROUPS CGROUP_CPUACCT CGROUP_DEVICE CGROUP_FREEZER CGROUP_SCHED CPUSETS - MACVLAN VETH BRIDGE + MACVLAN VETH BRIDGE BRIDGE_NETFILTER NF_NAT_IPV4 IP_NF_FILTER IP_NF_TARGET_MASQUERADE NETFILTER_XT_MATCH_{ADDRTYPE,CONNTRACK} NF_NAT NF_NAT_NEEDED