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

Merge pull request #3566 from benhosmer/develop

Browse Source 
#3556 from darkwyrm adding mint support
This commit is contained in:
Joseph Hall 2013-02-02 04:39:49 -08:00
commit da3c95ffb8
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/grains/core.py
View File

@ -25,7 +25,7 @@ import locale
# /etc/DISTRO-release checking that is part of platform.linux_distribution()
from platform import _supported_dists
_supported_dists += ('arch', 'mageia', 'meego', 'vmware', 'bluewhite64',
'slamd64', 'enterprise', 'ovs', 'system')
'slamd64', 'enterprise', 'ovs', 'system', 'mint')
# Import salt libs
import salt.log
@ -525,6 +525,7 @@ _OS_FAMILY_MAP = {
'OEL': 'RedHat',
'Mandrake': 'Mandriva',
'ESXi': 'VMWare',
'Mint': 'Debian',
'VMWareESX': 'VMWare',
'Bluewhite64': 'Bluewhite',
'Slamd64': 'Slackware',