saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert to original setting grain oscodename from lsb_distrib_codename first

Browse source
This commit is contained in:
David Murphy 2023-11-28 08:58:50 -07:00 • committed by Pedro Algarvio
parent a4ef503982
commit fd990ea300
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/grains/core.py
View file

@ -2353,7 +2353,9 @@ def _legacy_linux_distribution_data(grains, os_release, lsb_has_error):
):
grains.pop("lsb_distrib_release", None)
grains["osrelease"] = grains.get("lsb_distrib_release", osrelease).strip()
grains["oscodename"] = oscodename or grains.get("lsb_distrib_codename", "").strip()
grains["oscodename"] = grains.get("lsb_distrib_codename", "").strip() or oscodename
if "Red Hat" in grains["oscodename"]:
grains["oscodename"] = oscodename
if "os" not in grains:
grains["os"] = _derive_os_grain(grains["osfullname"])
# this assigns family names based on the os name