From f9251252d9b691db2a566201ad825954a3186b77 Mon Sep 17 00:00:00 2001
From: Stefan Agner <stefan@agner.ch>
Date: Mon, 25 Sep 2023 13:48:15 +0200
Subject: [PATCH] Update and fix containerd v1.6.22 (#2770)

* Introduce containerd configuration

Configure the CNI config directory to a writeable location.

Disable unnecessary plug-ins to avoid unnecessary error messages during
containerd startup.

* Bump buildroot

* buildroot 8ea671337e...d6894cf55f (1):
  > Revert "Revert "package/containerd: bump version to v1.6.22""
---
 buildroot                                         |  2 +-
 .../rootfs-overlay/etc/containerd/config.toml     | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 buildroot-external/rootfs-overlay/etc/containerd/config.toml

diff --git a/buildroot b/buildroot
index 8ea671337..d6894cf55 160000
--- a/buildroot
+++ b/buildroot
@@ -1 +1 @@
-Subproject commit 8ea671337eeee89169fec537dc0f4eca9e2a51ca
+Subproject commit d6894cf55f98e2cb644e06b0a57977de1926ce25
diff --git a/buildroot-external/rootfs-overlay/etc/containerd/config.toml b/buildroot-external/rootfs-overlay/etc/containerd/config.toml
new file mode 100644
index 000000000..f6f449cd4
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/etc/containerd/config.toml
@@ -0,0 +1,15 @@
+version = 2
+disabled_plugins = [
+  "io.containerd.snapshotter.v1.aufs",
+  "io.containerd.snapshotter.v1.devmapper",
+  "io.containerd.snapshotter.v1.zfs",
+  "io.containerd.internal.v1.opt",
+  "io.containerd.tracing.processor.v1.otlp",
+  "io.containerd.internal.v1.tracing"
+]
+
+[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
+cni_conf_dir = "/run/cni/net.d"
+
+[plugins."io.containerd.grpc.v1.cri".cni]
+conf_dir = "/run/cni/net.d"