From 5cba38c1750f24fc946cfe72f5f1fc971b58d90b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Wed, 23 Aug 2023 16:49:26 +0200 Subject: [PATCH] kata-deploy: Avoid failing on content removal MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We can simply use `rm -f` all over the place and avoid the container returning any error. Fixes: #7733 Signed-off-by: Fabiano Fidêncio --- tools/packaging/kata-deploy/scripts/kata-deploy.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/packaging/kata-deploy/scripts/kata-deploy.sh b/tools/packaging/kata-deploy/scripts/kata-deploy.sh index 496c58e638..69904fb72e 100755 --- a/tools/packaging/kata-deploy/scripts/kata-deploy.sh +++ b/tools/packaging/kata-deploy/scripts/kata-deploy.sh @@ -167,7 +167,7 @@ function backup_shim() { if [ ! -f "${shim_backup}" ]; then mv "${shim_file}" "${shim_backup}" else - rm "${shim_file}" + rm -f "${shim_file}" fi fi } @@ -222,12 +222,12 @@ function cleanup_different_shims_base() { local shim_binary="containerd-shim-kata-${shim}-v2" local shim_file="/usr/local/bin/${shim_binary}" - rm "${shim_file}" || true + rm -f "${shim_file}" restore_shim "${shim_file}" done - rm "${default_shim_file}" || true + rm -f "${default_shim_file}" restore_shim "${default_shim_file}" if [[ "${CREATE_RUNTIMECLASSES}" == "true" ]]; then @@ -375,9 +375,9 @@ function cleanup_cri_runtime() { } function cleanup_crio() { - rm $crio_drop_in_conf_file + rm -f $crio_drop_in_conf_file if [[ "${DEBUG}" == "true" ]]; then - rm $crio_drop_in_conf_file_debug + rm -f $crio_drop_in_conf_file_debug fi }