github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-13 21:56:32 +00:00
Code Issues Projects Releases Wiki Activity

kata-deploy: Avoid failing on content removal

Browse Source 
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 <fabiano.fidencio@intel.com>
(cherry picked from commit 5cba38c175)
This commit is contained in:
Fabiano Fidêncio 2023-08-23 16:49:26 +02:00
parent 6ea1d3bffd
commit 4f2c9372c3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/packaging/kata-deploy/scripts/kata-deploy.sh
View File

@ -155,7 +155,7 @@ function backup_shim() {
if [ ! -f "${shim_backup}" ]; then
mv "${shim_file}" "${shim_backup}"
else
rm "${shim_file}"
rm -f "${shim_file}"
fi
fi
}
@ -210,12 +210,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
@ -360,9 +360,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
}