Guard unzboot copy by arch in ocp_dtk_entrypoint, amd64 doesn't have the binary - #986
Open
lukiod wants to merge 1 commit into
Open
Guard unzboot copy by arch in ocp_dtk_entrypoint, amd64 doesn't have the binary#986lukiod wants to merge 1 commit into
lukiod wants to merge 1 commit into
Conversation
install.sh only builds/installs unzboot on aarch64 (EPEL, zboot kernels), but ocp_dtk_entrypoint's shared-dir prep copied it unconditionally, so DTK mode crash-loops on amd64 before any build starts: cp: cannot stat '/usr/bin/unzboot': No such file or directory. Guards both copy sites (shared-dir prep and the later bin staging) behind an aarch64 check using the same TARGETARCH/DRIVER_ARCH normalization already used elsewhere in this file and in install.sh. Verified by extracting both changed blocks and running them under bash with TARGETARCH set to each value: amd64 skips the copy cleanly with no missing-file error, arm64 with a real file present still copies it correctly.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #984.
install.shonly builds/installsunzbooton aarch64 (EPEL, zboot kernels).ocp_dtk_entrypoint's shared-dir prep copied it unconditionally, so DTK mode crash-loops on amd64 before any build starts:Guards both copy sites (the initial shared-dir prep in
nv-ctr-run-with-dtk, and the later bin staging indtk-build-driverwhich already has$DRIVER_ARCHcomputed) behind an aarch64 check, using the sameTARGETARCH/DRIVER_ARCHnormalization already used elsewhere in this file and ininstall.sh.Verified by extracting both changed blocks and running them under bash with
TARGETARCHset to each value: amd64 skips the copy cleanly with no missing-file error, arm64 with a real file present still copies it correctly.