From 19288aab46220a6fbdf5cb2a7be4a03fa64d4c55 Mon Sep 17 00:00:00 2001 From: Julio Montes Date: Tue, 21 May 2019 14:00:41 -0500 Subject: [PATCH] data/kata-collect-data: support kata containers snap Use `kata-containers.runtime` that is the runtime binary, to collect the data if the kata-runtime binary is not installed fixes #1720 Signed-off-by: Julio Montes --- data/kata-collect-data.sh.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/data/kata-collect-data.sh.in b/data/kata-collect-data.sh.in index 7a4ddc571b..b503a960cd 100644 --- a/data/kata-collect-data.sh.in +++ b/data/kata-collect-data.sh.in @@ -7,7 +7,10 @@ typeset -r script_name=${0##*/} typeset -r runtime_name="@RUNTIME_NAME@" -typeset -r runtime=$(command -v "$runtime_name" 2>/dev/null) +typeset -r runtime_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 issue_url="@PROJECT_BUG_URL@" typeset -r script_version="@VERSION@ (commit @COMMIT@)"