From fbf22413485e53b51c25b4ad397dfa89aac8c575 Mon Sep 17 00:00:00 2001 From: Robert James Hernandez Date: Fri, 6 Feb 2015 15:57:01 -0800 Subject: [PATCH] Allow mint to use upstart --- salt/modules/service.py | 3 ++- salt/modules/upstart.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/salt/modules/service.py b/salt/modules/service.py index f5b0d160bf..05db855c1c 100644 --- a/salt/modules/service.py +++ b/salt/modules/service.py @@ -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 diff --git a/salt/modules/upstart.py b/salt/modules/upstart.py index c7e46d6cbc..46fe74664e 100644 --- a/salt/modules/upstart.py +++ b/salt/modules/upstart.py @@ -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'