Skip to content

Commit 2f66a8f

Browse files
committed
cidata: containerd: avoid overwriting existing config files
When containerd.system is enabled, /etc/containerd/config.toml and /etc/buildkit/buildkitd.toml were always overwritten. Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
1 parent 70a3f13 commit 2f66a8f

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

pkg/cidata/cidata.TEMPLATE.d/boot/40-install-containerd.sh

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,9 @@ fi
4242
rm -rf "${tmp_extract_nerdctl}"
4343

4444
if [ "${LIMA_CIDATA_CONTAINERD_SYSTEM}" = 1 ]; then
45-
mkdir -p /etc/containerd /etc/buildkit
46-
cat >"/etc/containerd/config.toml" <<EOF
45+
if [ ! -e /etc/containerd/config.toml ]; then
46+
mkdir -p /etc/containerd
47+
cat >"/etc/containerd/config.toml" <<EOF
4748
version = 2
4849
[plugins."io.containerd.grpc.v1.cri"]
4950
enable_cdi = true
@@ -52,7 +53,10 @@ if [ "${LIMA_CIDATA_CONTAINERD_SYSTEM}" = 1 ]; then
5253
type = "snapshot"
5354
address = "/run/containerd-stargz-grpc/containerd-stargz-grpc.sock"
5455
EOF
55-
cat >"/etc/buildkit/buildkitd.toml" <<EOF
56+
fi
57+
if [ ! -e /etc/buildkit/buildkitd.toml ]; then
58+
mkdir -p /etc/buildkit
59+
cat >"/etc/buildkit/buildkitd.toml" <<EOF
5660
[worker.oci]
5761
enabled = false
5862
@@ -61,6 +65,7 @@ EOF
6165
namespace = "${CONTAINERD_NAMESPACE}"
6266
snapshotter = "${CONTAINERD_SNAPSHOTTER}"
6367
EOF
68+
fi
6469
systemctl enable --now containerd buildkit stargz-snapshotter
6570
fi
6671

0 commit comments

Comments
 (0)