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

Further refinement of handling for verious OS's when lsb error

Browse source
This commit is contained in:
David Murphy 2023-11-29 09:27:28 -07:00 • committed by Pedro Algarvio
parent 6502f4c730
commit 8e5d94b210
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
salt/grains/core.py
View file

@ -2356,16 +2356,15 @@ def _legacy_linux_distribution_data(grains, os_release, lsb_has_error):
grains["osrelease"] = grains.get("lsb_distrib_release", osrelease).strip() grains["osrelease"] = grains.get("lsb_distrib_release", osrelease).strip()
# allow for codename being within brackets on certain OS # allow for codename being within brackets on certain OS
if grains["lsb_distrib_codename"] and ( if grains.get("lsb_distrib_codename", "") and (
grains["os"] == "Rocky" any(os in grains.get("os", "") for os in ["Rocky", "AlmaLinux", "AstraLinuxSE"])
or grains["os"] == "AlmaLinux"
or grains["os"] == "AstraLinuxSE"
): ):
test_strg = grains["lsb_distrib_codename"].split("(", maxsplit=1) test_strg = grains["lsb_distrib_codename"].split("(", maxsplit=1)
if len(test_strg) >= 2: if len(test_strg) >= 2:
test_strg_2 = test_strg[1].split(")", maxsplit=1) test_strg_2 = test_strg[1].split(")", maxsplit=1)
if grains["os"] == "AstraLinuxSE": if grains["os"] == "AstraLinuxSE":
grains["lsb_distrib_codename"] = test_strg_2[0].lower() # AstraLinuxSE has version aka 'Smolensk 1.6'
grains["lsb_distrib_codename"] = test_strg_2[0].split()[0].lower()
else: else:
grains["lsb_distrib_codename"] = test_strg_2[0] grains["lsb_distrib_codename"] = test_strg_2[0]