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

Fix debian grains setup

Browse Source 
This was broken in 885e00b because the updated regex now removes the
slash in 'Debian GNU/Linux'.

This issue did not make it into an official release, it exists only in
the head of the 2015.8 branch.
This commit is contained in:
Erik Johnson 2016-02-22 10:48:01 -06:00
parent e24685b89a
commit e3d549d376
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/grains/core.py
View File

@ -908,7 +908,7 @@ def id_():
'''
return {'id': __opts__.get('id', '')}
_REPLACE_LINUX_RE = re.compile(r'\Wlinux', re.IGNORECASE)
_REPLACE_LINUX_RE = re.compile(r'\W(?:gnu/)?linux', re.IGNORECASE)
# This maps (at most) the first ten characters (no spaces, lowercased) of
# 'osfullname' to the 'os' grain that Salt traditionally uses.
@ -920,8 +920,7 @@ _OS_NAME_MAP = {
'archarm': 'Arch ARM',
'arch': 'Arch',
'debian': 'Debian',
'debiangnu/': 'Debian',
'raspbiangn': 'Raspbian',
'raspbian': 'Raspbian',
'fedoraremi': 'Fedora',
'amazonami': 'Amazon',
'alt': 'ALT',