From ddccbd4764181d08ab7379b282197554e14357da Mon Sep 17 00:00:00 2001 From: Shunsuke Kimura Date: Tue, 8 Apr 2025 06:05:23 +0900 Subject: [PATCH 1/2] runtime: Add Path for kata-deploy When installing with kata-deploy, usually `/opt/kata/bin` is not in the PATH. Therefore, it will fail to execute. so add it to the PATH. Fixes: #11122 Signed-off-by: Shunsuke Kimura Co-authored-by: Jakob Naucke --- src/runtime/data/kata-collect-data.sh.in | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/runtime/data/kata-collect-data.sh.in b/src/runtime/data/kata-collect-data.sh.in index d28ea277a9..78f73e89f5 100644 --- a/src/runtime/data/kata-collect-data.sh.in +++ b/src/runtime/data/kata-collect-data.sh.in @@ -5,18 +5,22 @@ # SPDX-License-Identifier: Apache-2.0 # +# kata-deploy installs binaries in /opt/kata/bin by default, which is not in the PATH. +# We need to add it to PATH to ensure commands like kata-monitor and kata-runtime. +SCRIPT_DIR="$(readlink -f "$(dirname "${BASH_SOURCE[0]}")")" + typeset -r script_name=${0##*/} typeset -r runtime_name="@RUNTIME_NAME@" -typeset -r runtime_path=$(command -v "$runtime_name" 2>/dev/null) +typeset -r runtime_path=$(PATH="$SCRIPT_DIR:$PATH" command -v "$runtime_name" 2>/dev/null) typeset -r runtime_snap_name="kata-containers.runtime" typeset -r runtime_snap_path=$(command -v "$runtime_snap_name" 2>/dev/null) typeset -r runtime=${runtime_path:-"$runtime_snap_path"} typeset -r containerd_shim_v2_name="containerd-shim-kata-v2" -typeset -r containerd_shim_v2=$(command -v "$containerd_shim_v2_name" 2>/dev/null) +typeset -r containerd_shim_v2=$(PATH="$SCRIPT_DIR:$PATH" command -v "$containerd_shim_v2_name" 2>/dev/null) typeset -r kata_monitor_name="kata-monitor" -typeset -r kata_monitor=$(command -v "$kata_monitor_name" 2>/dev/null) +typeset -r kata_monitor=$(PATH="$SCRIPT_DIR:$PATH" command -v "$kata_monitor_name" 2>/dev/null) typeset -r issue_url="@PROJECT_BUG_URL@" typeset -r script_version="@VERSION@ (commit @COMMIT@)" From 7177ab38274dca0629e9084d469a420ea974eb92 Mon Sep 17 00:00:00 2001 From: Shunsuke Kimura Date: Mon, 14 Apr 2025 07:51:46 +0900 Subject: [PATCH 2/2] runtime: execute using abs path Fixes: #11123 Signed-off-by: Shunsuke Kimura --- src/runtime/data/kata-collect-data.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/runtime/data/kata-collect-data.sh.in b/src/runtime/data/kata-collect-data.sh.in index 78f73e89f5..06831696b4 100644 --- a/src/runtime/data/kata-collect-data.sh.in +++ b/src/runtime/data/kata-collect-data.sh.in @@ -527,7 +527,7 @@ show_containerd_shimv2() { start_section "Containerd shim v2" - local cmd="${containerd_shim_v2_name} --version" + local cmd="${containerd_shim_v2} --version" msg "Containerd shim v2 is \`$containerd_shim_v2\`." @@ -781,7 +781,7 @@ show_kata_monitor_version() { start_section "Kata Monitor" - local cmd="${kata_monitor_name} --version" + local cmd="${kata_monitor} --version" msg "Kata Monitor \`$kata_monitor_name\`."