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

Merge pull request #20486 from l2ol33rt/fix_mint_17

Browse Source 
Allow Linux Mint to use upstart
This commit is contained in:
jfindlay 2015-02-06 20:51:52 -07:00
commit 654de6bc60
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/modules/service.py
View File

@ -40,7 +40,8 @@ def __virtual__():
'OEL',
'Linaro',
'elementary OS',
'McAfee OS Server'
'McAfee OS Server',
'Mint'
))
if __grains__.get('os', '') in disable:
return False

2
salt/modules/upstart.py
View File

@ -61,7 +61,7 @@ def __virtual__():
Only work on Ubuntu
'''
# Disable on these platforms, specific service modules exist:
if __grains__['os'] in ('Ubuntu', 'Linaro', 'elementary OS'):
if __grains__['os'] in ('Ubuntu', 'Linaro', 'elementary OS', 'Mint'):
return __virtualname__
elif __grains__['os'] in ('Debian', 'Raspbian'):
debian_initctl = '/sbin/initctl'