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

Recognize OSMC as Debian-based

Browse source
This commit is contained in:
Nicolas Kuttler 2022-08-18 19:03:23 +02:00 • committed by Gareth J. Greenaway
parent 1a546537b1
commit 01146e768e
3 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog/62198.fixed Normal file
View file

@ -0,0 +1 @@
Recognize OSMC as Debian-based

1
salt/grains/core.py
View file

@ -1734,6 +1734,7 @@ _OS_FAMILY_MAP = {
"AstraLinuxSE": "Debian", "AstraLinuxSE": "Debian",
"Alinux": "RedHat", "Alinux": "RedHat",
"Mendel": "Debian", "Mendel": "Debian",
"OSMC": "Debian",
} }
# Matches any possible format: # Matches any possible format:

22
tests/pytests/unit/grains/test_core.py
View file

@ -933,6 +933,28 @@ def test_rocky_8_os_grains(os_release_dir):
_run_os_grains_tests(os_release_dir, None, _os_release_map, expectation) _run_os_grains_tests(os_release_dir, None, _os_release_map, expectation)
@pytest.mark.skip_unless_on_linux
def test_osmc_os_grains(os_release_dir):
"""
Test if OS grains are parsed correctly in OSMC
"""
_os_release_map = {
"_linux_distribution": ("OSMC", "2022.03-1", "Open Source Media Center"),
}
expectation = {
"os": "OSMC",
"os_family": "Debian",
"oscodename": "Open Source Media Center",
"osfullname": "OSMC",
"osrelease": "2022.03-1",
"osrelease_info": (2022, "03-1"),
"osmajorrelease": 2022,
"osfinger": "OSMC-2022",
}
_run_os_grains_tests(os_release_dir, None, _os_release_map, expectation)
@pytest.mark.skip_unless_on_linux @pytest.mark.skip_unless_on_linux
def test_mendel_os_grains(os_release_dir): def test_mendel_os_grains(os_release_dir):
""" """