Skip to content

Do not crash at start on NetBSD and OpenBSD #68773

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
khorben wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Do not crash at start on NetBSD and OpenBSD #68773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46aca45
salt.grain.core: do not crash at start on NetBSD and OpenBSD
khorben Feb 26, 2026
00a2a1d
salt.utils.network: do not crash at start on NetBSD
khorben Feb 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion salt/grains/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2823,7 +2823,7 @@ def os_data():
grains["osfullname"] = "{} {}".format(grains["kernel"], grains["osrelease"])
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"]
grains.update(_bsd_cpudata(grains))
grains["osrelease"] = grains["kernelrelease"].split("-")[0]
grains["osfullname"] = "{} {}".format(grains["kernel"], grains["osrelease"])
Comment on lines +2826 to 2829

@bdrx312 bdrx312 Apr 1, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand this change. osfullname is already here on line 2829.

Expand Down
2 changes: 1 addition & 1 deletion salt/utils/network.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1099,7 +1099,7 @@ def netbsd_interfaces():
address)
"""
# NetBSD versions prior to 8.0 can still use linux_interfaces()
if Version(os.uname()[2]) < Version("8.0"):
if Version(os.uname()[2].split("_")[0]) < Version("8.0"):
return linux_interfaces()

ifconfig_path = salt.utils.path.which("ifconfig")
Expand Down
Loading