github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-29 12:54:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11199 from fidencio/topic/kata-deploy-fix-multiInstallSufix-behaviour-during-restarts

Browse Source 
helm: Avoid appending the multiInstallSuffix several times
This commit is contained in:
Zvonko Kaiser 2025-05-09 10:32:23 -04:00 committed by GitHub
commit 78ff72a386
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -352,6 +352,11 @@ function adjust_qemu_cmdline() {
[[ "${shim}" =~ ^(qemu|qemu-coco-dev)$ ]] && qemu_share="qemu" [[ "${shim}" =~ ^(qemu|qemu-coco-dev)$ ]] && qemu_share="qemu"
qemu_binary=$(tomlq '.hypervisor.qemu.path' ${config_path} | tr -d \") qemu_binary=$(tomlq '.hypervisor.qemu.path' ${config_path} | tr -d \")
if [[ -n "${MULTI_INSTALL_SUFFIX}" ]] && [[ "${qemu_binary}" == *-installation-prefix ]]; then
# This means that we'e already adapted the qemu-binary to the
# correct path, and we have nothing else to do here.
return
fi
qemu_binary_script="${qemu_binary}-installation-prefix" qemu_binary_script="${qemu_binary}-installation-prefix"
qemu_binary_script_host_path="/host/${qemu_binary_script}" qemu_binary_script_host_path="/host/${qemu_binary_script}"