From 01146e768ea4b3204c974008a95474c2251da0c0 Mon Sep 17 00:00:00 2001 From: Nicolas Kuttler Date: Thu, 18 Aug 2022 19:03:23 +0200 Subject: [PATCH] Recognize OSMC as Debian-based --- changelog/62198.fixed | 1 + salt/grains/core.py | 1 + tests/pytests/unit/grains/test_core.py | 22 ++++++++++++++++++++++ 3 files changed, 24 insertions(+) create mode 100644 changelog/62198.fixed diff --git a/changelog/62198.fixed b/changelog/62198.fixed new file mode 100644 index 00000000000..9a33558a11d --- /dev/null +++ b/changelog/62198.fixed @@ -0,0 +1 @@ +Recognize OSMC as Debian-based diff --git a/salt/grains/core.py b/salt/grains/core.py index c062c344417..2de18bcc4f7 100644 --- a/salt/grains/core.py +++ b/salt/grains/core.py @@ -1734,6 +1734,7 @@ _OS_FAMILY_MAP = { "AstraLinuxSE": "Debian", "Alinux": "RedHat", "Mendel": "Debian", + "OSMC": "Debian", } # Matches any possible format: diff --git a/tests/pytests/unit/grains/test_core.py b/tests/pytests/unit/grains/test_core.py index cd6977d9294..dd2932fff2d 100644 --- a/tests/pytests/unit/grains/test_core.py +++ b/tests/pytests/unit/grains/test_core.py @@ -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) +@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 def test_mendel_os_grains(os_release_dir): """