From 990cfa75598f5213340a3b5d39dbfafb7c422cd4 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Wed, 1 Mar 2023 16:43:51 +0100 Subject: [PATCH] kata-deploy-cc: Cleanup runtime-rs /opt/confidential-containers/runtime-rs needs to be cleaned up, otherwise containerd post-uninstall script fails due to weird logic in `rmdir --ignore-fail-on-non-empty`. Fixes: #6396 Signed-off-by: Jeremi Piotrowski --- tools/packaging/kata-deploy-cc/scripts/kata-deploy.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/packaging/kata-deploy-cc/scripts/kata-deploy.sh b/tools/packaging/kata-deploy-cc/scripts/kata-deploy.sh index 977004dc68..ca893eb6fb 100755 --- a/tools/packaging/kata-deploy-cc/scripts/kata-deploy.sh +++ b/tools/packaging/kata-deploy-cc/scripts/kata-deploy.sh @@ -207,7 +207,8 @@ function remove_artifacts() { /opt/confidential-containers/bin/kata-collect-data.sh \ /opt/confidential-containers/bin/qemu-system-x86_64 \ /opt/confidential-containers/bin/qemu-system-x86_64-tdx \ - /opt/confidential-containers/bin/cloud-hypervisor + /opt/confidential-containers/bin/cloud-hypervisor \ + /opt/confidential-containers/runtime-rs # Try to remove the /opt/confidential-containers directory. # If it's not empty, don't bother force removing it, as the