buildah: fix a nil pointer reference on FreeBSD #5580
Merged
Conversation
This file contains 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
|
Ephemeral COPR build failed. @containers/packit-build please check. |
85a753d to
e62a744
Compare
When setting up resolv.conf on Linux we need to reference the Linux namespaces from spec.Linux. This is not needed for FreeBSD and this change moves the dereference of spec.Linux to addResolvConfEntries and makes it conditional. Signed-off-by: Doug Rabson <dfr@rabson.org>
|
No tests needed since there should be no functional different to the Linux build and existing tests can verify that. |
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: dfr, flouthoc, rhatdan The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/lgtm |
44ef3a8
into
containers:main
32 of 36 checks passed
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
When setting up resolv.conf on Linux we need to reference the Linux namespaces from spec.Linux. This is not needed for FreeBSD and this change moves the dereference of spec.Linux to addResolvConfEntries and makes it conditional.
What type of PR is this?
/kind bug
What this PR does / why we need it:
This is needed to make 'buildah run' work on FreeBSD if networking is enabled.
How to verify it
Which issue(s) this PR fixes:
None
Special notes for your reviewer:
Does this PR introduce a user-facing change?