github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-26 15:32:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7734 from fidencio/topic/kata-deploy-fix-removal

Browse Source 
kata-deploy: Avoid failing on content removal
This commit is contained in:
David Esparza 2023-08-23 10:29:57 -06:00 committed by GitHub
commit ebce5d25a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -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
}