File fix-for-suse-expanded-support-detection.patch of Package salt

Overview Repositories Revisions Requests Users Attributes Meta

File fix-for-suse-expanded-support-detection.patch of Package salt (Revision 023e6cbce6bdd1754ba30e67e59838f6)

Currently displaying revision 023e6cbce6bdd1754ba30e67e59838f6 , Show latest

From 7be26299bc7b6ec2065ab13857f088dc500ee882 Mon Sep 17 00:00:00 2001
From: Jochen Breuer <jbreuer@suse.de>
Date: Thu, 6 Sep 2018 17:15:18 +0200
Subject: [PATCH] Fix for SUSE Expanded Support detection

A SUSE ES installation has both, the centos-release and redhat-release
file. Since os_data only used the centos-release file to detect a
CentOS installation, this lead to SUSE ES being detected as CentOS.

This change also adds a check for redhat-release and then marks the
'lsb_distrib_id' as RedHat.
---
 salt/grains/core.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/salt/grains/core.py b/salt/grains/core.py
index 710c57f28f..1199ad274f 100644
--- a/salt/grains/core.py
+++ b/salt/grains/core.py
@@ -2279,6 +2279,15 @@ def _legacy_linux_distribution_data(grains, os_release, lsb_has_error):
                 log.trace("Parsing distrib info from /etc/centos-release")
                 # CentOS Linux
                 grains["lsb_distrib_id"] = "CentOS"
+                # Maybe CentOS Linux; could also be SUSE Expanded Support.
+                # SUSE ES has both, centos-release and redhat-release.
+                if os.path.isfile("/etc/redhat-release"):
+                    with salt.utils.files.fopen("/etc/redhat-release") as ifile:
+                        for line in ifile:
+                            if "red hat enterprise linux server" in line.lower():
+                                # This is a SUSE Expanded Support Rhel installation
+                                grains["lsb_distrib_id"] = "RedHat"
+                                break
                 with salt.utils.files.fopen("/etc/centos-release") as ifile:
                     for line in ifile:
                         # Need to pull out the version and codename
-- 
2.39.2

Places

File fix-for-suse-expanded-support-detection.patch of Package salt (Revision 023e6cbce6bdd1754ba30e67e59838f6)

Places