Do not crash at start on NetBSD and OpenBSD#68773
Open
khorben wants to merge 3 commits into
Open
Conversation
twangboy
requested changes
Feb 27, 2026
twangboy
left a comment
twangboy
left a comment
Contributor
There was a problem hiding this comment.
Could we get a changelog and a test please
Contributor
|
Consider opening this against 3006.x as the bug probably exists there. |
bdrx312
reviewed
Apr 1, 2026
Comment on lines
+2826
to
2829
| grains["os_family"] = grains["osfullname"] = grains["os"] = grains["kernel"] | ||
| grains.update(_bsd_cpudata(grains)) | ||
| grains["osrelease"] = grains["kernelrelease"].split("-")[0] | ||
| grains["osfullname"] = "{} {}".format(grains["kernel"], grains["osrelease"]) |
Contributor
There was a problem hiding this comment.
I don't understand this change. osfullname is already here on line 2829.
twangboy
approved these changes
Jul 13, 2026
This avoids accessing an undefined element of the grains dictionary, on both NetBSD and OpenBSD. This matches the corresponding code for FreeBSD. Tested on NetBSD/amd64.
This patch restricts the OS version test to the part before "_" on NetBSD; this could raise an exception if py-packaging wasn't aware of the suffix (e.g., "BETA" would work but "STABLE" not). Tested on NetBSD/amd64.
Add changelog entry 68773 and unit tests covering: - netbsd_interfaces() tolerating OS version strings with underscore suffixes (e.g. 10.1_STABLE) without raising InvalidVersion - os_data() correctly setting osfullname on NetBSD and OpenBSD
twangboy
force-pushed
the
khorben/netbsd-crashes
branch
from
49a479c to
a0900b9
Compare
bdrx312
reviewed
Jul 13, 2026
| grains.update(_bsd_cpudata(grains)) | ||
| elif grains["kernel"] in ("OpenBSD", "NetBSD"): | ||
| grains["os_family"] = grains["os"] = grains["kernel"] | ||
| grains["os_family"] = grains["osfullname"] = grains["os"] = grains["kernel"] |
Contributor
There was a problem hiding this comment.
Can you explain why you are setting grains["osfullname"] here when we immediately change it 3 lines below?
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
4 participants
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.
What does this PR do?
This PR fixes two crashes when starting salt_master on NetBSD; one of the crashes is expected to affect OpenBSD as well.
What issues does this PR fix or reference?
The patch for salt/grains/core.py avoids accessing an undefined element
of the grains dictionary, on both NetBSD and OpenBSD. This matches the
corresponding code for FreeBSD.
The patch for salt/utils/network.py restricts the OS version test to the
part before "_" on NetBSD; this could raise an exception if py-packaging
wasn't aware of the suffix (e.g., "BETA" would work but "STABLE" not).
Previous Behavior
And:
New Behavior
Salt master starts as expected.
Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
Yes