From 337010c50d11cb58c31a74676b94c586da7eb290 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 18 Jun 2013 12:35:27 -0700 Subject: [PATCH 1/2] fix(cros-kernel/x86_64_defconfig) enable CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m Docker uses this to manage the network containers properly. --- .../coreos-overlay/eclass/cros-kernel/x86_64_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel/x86_64_defconfig b/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel/x86_64_defconfig index ee5a6ace72..1c0d943531 100644 --- a/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel/x86_64_defconfig +++ b/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel/x86_64_defconfig @@ -758,7 +758,7 @@ CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m # # Xtables matches # -# CONFIG_NETFILTER_XT_MATCH_ADDRTYPE is not set +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m # CONFIG_NETFILTER_XT_MATCH_BPF is not set # CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set # CONFIG_NETFILTER_XT_MATCH_COMMENT is not set From 9750d3979ca2e60fbe72f0addf6c4ea03f218d5f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 18 Jun 2013 12:37:01 -0700 Subject: [PATCH 2/2] fix(cros-kernel/x86_64_defconfig) enable some more vlan modules Enable: CONFIG_MACVLAN=m CONFIG_MACVTAP=m CONFIG_VETH=m Docker needs VETH, and might use MACVLAN in the future, it can't hurt to enable them, they take up no running space if not used. --- .../coreos-overlay/eclass/cros-kernel/x86_64_defconfig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel/x86_64_defconfig b/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel/x86_64_defconfig index 1c0d943531..00b3ba9590 100644 --- a/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel/x86_64_defconfig +++ b/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel/x86_64_defconfig @@ -1364,13 +1364,14 @@ CONFIG_BONDING=m CONFIG_MII=m # CONFIG_IFB is not set # CONFIG_NET_TEAM is not set -# CONFIG_MACVLAN is not set +CONFIG_MACVLAN=m +CONFIG_MACVTAP=m CONFIG_VXLAN=m # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set CONFIG_TUN=m -# CONFIG_VETH is not set +CONFIG_VETH=m CONFIG_VIRTIO_NET=m # CONFIG_ARCNET is not set