From a6c3f75872bdd13896c36e1a6415d8608abb0543 Mon Sep 17 00:00:00 2001 From: "James O. D. Hunt" Date: Mon, 18 Mar 2024 14:06:46 +0000 Subject: [PATCH] kata-manager: Fix Docker install Fix the Docker install by removing the second (erroneous) call to `containerd_installed()` in `handle_docker()`. Without this fix, installing using Docker (`-D`) will work *iff* you already have containerd installed. However, if you do not have containerd installed, the `containerd_installed()` function returns 1, which exits the script as we're running with `set -e`, leaving a broken Docker installation. > **Note:** containerd is installed via Docker's `get-docker.sh` script. Fixes: #9292. Signed-off-by: James O. D. Hunt --- utils/kata-manager.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/utils/kata-manager.sh b/utils/kata-manager.sh index 70cbd48e29..3375b86a80 100755 --- a/utils/kata-manager.sh +++ b/utils/kata-manager.sh @@ -906,8 +906,6 @@ handle_docker() [ -e "$containerd_config" ] && sudo mv $containerd_config $containerd_config.system-$(date -Iseconds) fi - containerd_installed - local filename='get-docker.sh' local file