diff --git a/tools/packaging/kernel/configs/fragments/arm64/dummy.conf b/tools/packaging/kernel/configs/fragments/arm64/dummy.conf deleted file mode 100644 index c0377ab06663..000000000000 --- a/tools/packaging/kernel/configs/fragments/arm64/dummy.conf +++ /dev/null @@ -1 +0,0 @@ -CONFIG_DUMMY=y diff --git a/tools/packaging/kernel/configs/fragments/common/dummy.conf b/tools/packaging/kernel/configs/fragments/common/dummy.conf new file mode 100644 index 000000000000..2c68c32c5acc --- /dev/null +++ b/tools/packaging/kernel/configs/fragments/common/dummy.conf @@ -0,0 +1,4 @@ +# (legacy) enable dummy module to make Emissary work on microVMs +# Should be deleted once Emissary will stop dual binding +CONFIG_DUMMY=y + diff --git a/tools/packaging/kernel/configs/fragments/common/keys.conf b/tools/packaging/kernel/configs/fragments/common/keys.conf new file mode 100644 index 000000000000..957ee122d275 --- /dev/null +++ b/tools/packaging/kernel/configs/fragments/common/keys.conf @@ -0,0 +1 @@ +CONFIG_KEYS=y diff --git a/tools/packaging/kernel/configs/fragments/common/netfilter.conf b/tools/packaging/kernel/configs/fragments/common/netfilter.conf index 55b5d330d222..f514727df484 100644 --- a/tools/packaging/kernel/configs/fragments/common/netfilter.conf +++ b/tools/packaging/kernel/configs/fragments/common/netfilter.conf @@ -197,6 +197,8 @@ CONFIG_IP_NF_SECURITY=y CONFIG_IP_NF_ARPTABLES=y CONFIG_IP_NF_ARPFILTER=y CONFIG_IP_NF_ARP_MANGLE=y -CONFIG_NF_DUP_IPV6=y -CONFIG_NF_LOG_IPV6=y -CONFIG_NF_DEFRAG_IPV6=y + +# [datadog] Disable IPv6 in the kernel +# CONFIG_NF_DUP_IPV6=y +# CONFIG_NF_LOG_IPV6=y +# CONFIG_NF_DEFRAG_IPV6=y diff --git a/tools/packaging/kernel/configs/fragments/common/network.conf b/tools/packaging/kernel/configs/fragments/common/network.conf index 2270c9a14a61..eefb624fb6ab 100644 --- a/tools/packaging/kernel/configs/fragments/common/network.conf +++ b/tools/packaging/kernel/configs/fragments/common/network.conf @@ -34,8 +34,10 @@ CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_CONG_BBR=y CONFIG_DEFAULT_BBR=y CONFIG_TCP_MD5SIG=y -CONFIG_IPV6=y -CONFIG_IPV6_MULTIPLE_TABLES=y + +# [datadog] Disable IPv6 +# CONFIG_IPV6=y +# CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_STP=y CONFIG_BRIDGE=y diff --git a/tools/packaging/kernel/configs/fragments/x86_64/dummy.conf b/tools/packaging/kernel/configs/fragments/x86_64/dummy.conf deleted file mode 100644 index c0377ab06663..000000000000 --- a/tools/packaging/kernel/configs/fragments/x86_64/dummy.conf +++ /dev/null @@ -1 +0,0 @@ -CONFIG_DUMMY=y