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

Merge pull request #3776 from fidencio/wip/fix-unbound-variable-tools-clh

Browse Source 
Fix unbound variable / typo on error mesage
This commit is contained in:
Eric Ernst
2022-02-25 15:49:08 -08:00
committed by GitHub
parent ea1876f057 a9ba7c132b
commit 08976b591b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/runtime/virtcontainers/clh.go
View File

@@ -657,7 +657,7 @@ func (clh *cloudHypervisor) HotplugRemoveDevice(ctx context.Context, devInfo int
defer span.End() defer span.End()
if clh.config.ConfidentialGuest { if clh.config.ConfidentialGuest {
return nil, errors.New("Device hotplug addition is not supported in confidential mode") return nil, errors.New("Device hotplug removal is not supported in confidential mode")
} }
var deviceID string var deviceID string

4
tools/packaging/static-build/cloud-hypervisor/build-static-clh.sh
View File

@@ -16,7 +16,7 @@ ARCH=$(uname -m)
script_dir=$(dirname $(readlink -f "$0")) script_dir=$(dirname $(readlink -f "$0"))
kata_version="${kata_version:-}" kata_version="${kata_version:-}"
force_build_from_source="${force_build_from_source:-false}" force_build_from_source="${force_build_from_source:-false}"
extra_build_args="${extra_build_args:-}" features="${features:-}"
source "${script_dir}/../../scripts/lib.sh" source "${script_dir}/../../scripts/lib.sh"
@@ -68,7 +68,7 @@ if [ "${ARCH}" == "aarch64" ]; then
force_build_from_source="true" force_build_from_source="true"
fi fi
if [ -n "${extra_build_args}" ]; then if [ -n "${features}" ]; then
info "As an extra build argument has been passed to the script, forcing to build from source" info "As an extra build argument has been passed to the script, forcing to build from source"
force_build_from_source="true" force_build_from_source="true"
fi fi