From c17a6f1b53aff32658316b127722df9bd1ffc650 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Tue, 6 Sep 2022 22:51:23 +0200 Subject: [PATCH] kata-deploy-cc: Simplify cleanup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's remove the whole content from: * /opt/confidential-containers/libexec * /opt/confidential-containers/share And then manually remove the binaries under bin directory` as the pre-install hook will drop binaries there. Finally, let's call a `rmdir -p /opt/confidential-containers/bin` which should take care of the cleanup in case no pre-install hook is used, and let's make sure we pass `--ignore-fail-on-non-empty` so we don't fail when using a pre-install hook. Fixes: #5128 Signed-off-by: Fabiano Fidêncio --- .../packaging/kata-deploy-cc/scripts/kata-deploy.sh | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/tools/packaging/kata-deploy-cc/scripts/kata-deploy.sh b/tools/packaging/kata-deploy-cc/scripts/kata-deploy.sh index b148874278..cf2b59d698 100755 --- a/tools/packaging/kata-deploy-cc/scripts/kata-deploy.sh +++ b/tools/packaging/kata-deploy-cc/scripts/kata-deploy.sh @@ -198,14 +198,8 @@ function configure_containerd() { function remove_artifacts() { echo "deleting kata artifacts" rm -rf \ - /opt/confidential-containers/libexec/virtiofsd \ - /opt/confidential-containers/share/defaults/kata-containers/ \ - /opt/confidential-containers/share/bash-completion/completions/kata-runtime \ - /opt/confidential-containers/share/kata-qemu/ \ - /opt/confidential-containers/share/kata-qemu-tdx/ \ - /opt/confidential-containers/share/kata-containers/ \ - /opt/confidential-containers/share/td-shim/ \ - /opt/confidential-containers/share/tdvf/ \ + /opt/confidential-containers/libexec/ \ + /opt/confidential-containers/share/ \ /opt/confidential-containers/bin/kata-monitor \ /opt/confidential-containers/bin/containerd-shim-kata-v2 \ /opt/confidential-containers/bin/kata-runtime \ @@ -217,7 +211,7 @@ function remove_artifacts() { # Try to remove the /opt/confidential-containers directory. # If it's not empty, don't bother force removing it, as the # pre-install script also drops files here. - rmdir /opt/confidential-containers 2>/dev/null + rmdir --ignore-fail-on-non-empty -p /opt/confidential-containers/bin } function cleanup_cri_runtime() {