valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #47951 from rares-pop/dev/iepopr/fix_nilinuxrt_core_grains

Browse Source 
Fix NI Linux RT distribution core grains
This commit is contained in:
Nicole Thomas 2018-06-07 10:36:09 -04:00 committed by GitHub
commit 5b4e7953e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
salt/grains/core.py
View File

@ -1350,7 +1350,6 @@ _OS_NAME_MAP = {
'scientific': 'ScientificLinux', 'scientific': 'ScientificLinux',
'synology': 'Synology', 'synology': 'Synology',
'nilrt': 'NILinuxRT', 'nilrt': 'NILinuxRT',
'nilrt-xfce': 'NILinuxRT-XFCE',
'poky': 'Poky', 'poky': 'Poky',
'manjaro': 'Manjaro', 'manjaro': 'Manjaro',
'manjarolin': 'Manjaro', 'manjarolin': 'Manjaro',
@ -1423,7 +1422,6 @@ _OS_FAMILY_MAP = {
'Cumulus': 'Debian', 'Cumulus': 'Debian',
'Deepin': 'Debian', 'Deepin': 'Debian',
'NILinuxRT': 'NILinuxRT', 'NILinuxRT': 'NILinuxRT',
'NILinuxRT-XFCE': 'NILinuxRT',
'KDE neon': 'Debian', 'KDE neon': 'Debian',
'Void': 'Void', 'Void': 'Void',
'IDMS': 'Debian', 'IDMS': 'Debian',
@ -1788,8 +1786,11 @@ def os_data():
# so that linux_distribution() does the /etc/lsb-release parsing, but # so that linux_distribution() does the /etc/lsb-release parsing, but
# we do it anyway here for the sake for full portability. # we do it anyway here for the sake for full portability.
if 'osfullname' not in grains: if 'osfullname' not in grains:
grains['osfullname'] = \ # If NI Linux RT distribution, set the grains['osfullname'] to 'nilrt'
grains.get('lsb_distrib_id', osname).strip() if grains.get('lsb_distrib_id', '').lower().startswith('nilrt'):
grains['osfullname'] = 'nilrt'
else:
grains['osfullname'] = grains.get('lsb_distrib_id', osname).strip()
if 'osrelease' not in grains: if 'osrelease' not in grains:
# NOTE: This is a workaround for CentOS 7 os-release bug # NOTE: This is a workaround for CentOS 7 os-release bug
# https://bugs.centos.org/view.php?id=8359 # https://bugs.centos.org/view.php?id=8359