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

Update os_name_map in core grains for new manjaro systems

Browse source
This commit is contained in:
Ch3LL 2017-06-23 10:12:58 -04:00
parent aa7c839fc5
commit e4dd72a3e7
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
salt/grains/core.py
View file

@ -1047,6 +1047,7 @@ _OS_NAME_MAP = {
'synology': 'Synology',
'nilrt': 'NILinuxRT',
'manjaro': 'Manjaro',
'manjarolin': 'Manjaro',
'antergos': 'Antergos',
'sles': 'SUSE',
'slesexpand': 'RES',

2
salt/modules/pacman.py
View file

@ -37,7 +37,7 @@ def __virtual__():
'''
Set the virtual pkg module if the os is Arch
'''
if __grains__['os_family'] in ('Arch', 'ManjaroLinux'):
if __grains__['os_family'] == 'Arch':
return __virtualname__
return (False, 'The pacman module could not be loaded: unsupported OS family.')