From a43f95d01b948a6d61e7524d4029bb894b09ca41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Mon, 5 Sep 2022 14:20:29 +0200 Subject: [PATCH] kata-deploy: Rely on the configure config path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instead of passing a `KATA_CONF_FILE` environament variable, let's rely on the configured (in the container engine) config path, as both containerd and CRI-O support it, and we're using this for both of them. This is a "backport" of f7ccf92dc82e9264fafd0ccf565f6dd014786e3e, from the original `kata-deploy.sh` to the one used for Confidential Containers. Signed-off-by: Fabiano Fidêncio --- tools/packaging/kata-deploy-cc/scripts/kata-deploy.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tools/packaging/kata-deploy-cc/scripts/kata-deploy.sh b/tools/packaging/kata-deploy-cc/scripts/kata-deploy.sh index c290cdd0e7..db79f2d278 100755 --- a/tools/packaging/kata-deploy-cc/scripts/kata-deploy.sh +++ b/tools/packaging/kata-deploy-cc/scripts/kata-deploy.sh @@ -94,10 +94,7 @@ function configure_different_shims_base() { fi fi - cat << EOF | tee "$shim_file" -#!/usr/bin/env bash -KATA_CONF_FILE=/opt/confidential-containers/share/defaults/kata-containers/configuration-${shim}.toml /opt/confidential-containers/bin/containerd-shim-kata-v2 "\$@" -EOF + ln -sf /opt/kata/bin/containerd-shim-kata-v2 "${shim_file}" chmod +x "$shim_file" if [ "${shim}" == "${default_shim}" ]; then