From 9a8d64d6b1b196a91dbc484738f5ea7a3dc2d303 Mon Sep 17 00:00:00 2001 From: Shunsuke Kimura Date: Fri, 28 Mar 2025 12:56:30 +0900 Subject: [PATCH] kata-deploy: execute in the host environment `containerd` command should be executed in the host environment. (To generate the config that matches the host's containerd version.) Fixes: #11092 Signed-off-by: Shunsuke Kimura --- tools/packaging/kata-deploy/scripts/kata-deploy.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/packaging/kata-deploy/scripts/kata-deploy.sh b/tools/packaging/kata-deploy/scripts/kata-deploy.sh index f284b7fb4a..e765c0d3fe 100755 --- a/tools/packaging/kata-deploy/scripts/kata-deploy.sh +++ b/tools/packaging/kata-deploy/scripts/kata-deploy.sh @@ -91,6 +91,10 @@ function host_systemctl() { nsenter --target 1 --mount systemctl "${@}" } +function host_exec() { + nsenter --target 1 --mount bash -c "$*" +} + function print_usage() { echo "Usage: $0 [install/cleanup/reset]" } @@ -876,9 +880,9 @@ function main() { mkdir -p $(dirname "$containerd_conf_file") touch "$containerd_conf_file" elif [[ "$runtime" == "containerd" ]]; then - if [ ! -f "$containerd_conf_file" ] && [ -d $(dirname "$containerd_conf_file") ] && [ -x "$(command -v containerd)" ]; then - containerd config default > "$containerd_conf_file" - fi + if [ ! -f "$containerd_conf_file" ] && [ -d $(dirname "$containerd_conf_file") ]; then + host_exec containerd config default > "$containerd_conf_file" + fi fi if [ $use_containerd_drop_in_conf_file = "true" ]; then