From b06b3ee3f81741e1efd900b3aba57a79695f6300 Mon Sep 17 00:00:00 2001 From: Joji Mekkatt <jojimtt@gmail.com> Date: Mon, 25 Feb 2019 23:44:18 +0000 Subject: [PATCH] Enable CONFIG_NF_CONNTRACK_ZONES --- .../minikube-iso/board/coreos/minikube/linux_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/deploy/iso/minikube-iso/board/coreos/minikube/linux_defconfig b/deploy/iso/minikube-iso/board/coreos/minikube/linux_defconfig index e9394abf9f..c770ca5a9f 100644 --- a/deploy/iso/minikube-iso/board/coreos/minikube/linux_defconfig +++ b/deploy/iso/minikube-iso/board/coreos/minikube/linux_defconfig @@ -20,7 +20,6 @@ CONFIG_RT_GROUP_SCHED=y CONFIG_CGROUP_PIDS=y CONFIG_CGROUP_FREEZER=y CONFIG_CGROUP_HUGETLB=y -CONFIG_CGROUP_NET_PRIO=y CONFIG_CPUSETS=y CONFIG_CGROUP_DEVICE=y CONFIG_CGROUP_CPUACCT=y @@ -114,6 +113,7 @@ CONFIG_NETFILTER=y CONFIG_NETFILTER_NETLINK_ACCT=y CONFIG_NETFILTER_NETLINK_QUEUE=y CONFIG_NF_CONNTRACK=m +CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NF_CONNTRACK_EVENTS=y CONFIG_NF_CONNTRACK_TIMEOUT=y CONFIG_NF_CONNTRACK_TIMESTAMP=y @@ -123,8 +123,6 @@ CONFIG_NF_CONNTRACK_SANE=m CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CT_NETLINK=m -CONFIG_NF_SOCKET_IPV4=m -CONFIG_NF_SOCKET_IPV6=m CONFIG_NETFILTER_XT_SET=m CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m @@ -229,6 +227,7 @@ CONFIG_IP_VS_SED=m CONFIG_IP_VS_NQ=m CONFIG_IP_VS_NFCT=y CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_NF_SOCKET_IPV4=m CONFIG_NF_LOG_ARP=m CONFIG_IP_NF_IPTABLES=y CONFIG_IP_NF_FILTER=y @@ -240,6 +239,7 @@ CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_IP_NF_MANGLE=y CONFIG_IP_NF_RAW=m CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_NF_SOCKET_IPV6=m CONFIG_IP6_NF_IPTABLES=y CONFIG_IP6_NF_MATCH_IPV6HEADER=y CONFIG_IP6_NF_FILTER=y @@ -277,6 +277,7 @@ CONFIG_NET_ACT_BPF=m CONFIG_OPENVSWITCH=m CONFIG_VSOCKETS=m CONFIG_VIRTIO_VSOCKETS=m +CONFIG_CGROUP_NET_PRIO=y CONFIG_BPF_JIT=y CONFIG_HAMRADIO=y CONFIG_CFG80211=y @@ -428,7 +429,6 @@ CONFIG_RTC_CLASS=y # CONFIG_RTC_HCTOSYS is not set CONFIG_DMADEVICES=y CONFIG_VIRT_DRIVERS=y -CONFIG_VBOXGUEST=m CONFIG_VIRTIO_PCI=y CONFIG_HYPERV=m CONFIG_HYPERV_UTILS=m