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

ubuntu is switching from upstart to systemd

Browse Source
This commit is contained in:
Sebastian Braun 2015-02-18 02:48:59 +01:00
parent 7dbfaffe3e
commit bfcab32885
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/modules/upstart.py
View File

@ -47,6 +47,7 @@ import os
# Import salt libs # Import salt libs
import salt.utils import salt.utils
import salt.modules.cmdmod import salt.modules.cmdmod
from salt.modules.systemd import _sd_booted
__func_alias__ = { __func_alias__ = {
'reload_': 'reload' 'reload_': 'reload'
@ -61,7 +62,9 @@ def __virtual__():
Only work on Ubuntu Only work on Ubuntu
''' '''
# Disable on these platforms, specific service modules exist: # Disable on these platforms, specific service modules exist:
if __grains__['os'] in ('Ubuntu', 'Linaro', 'elementary OS'): if _sd_booted(__context__):
return False
elif __grains__['os'] in ('Ubuntu', 'Linaro', 'elementary OS'):
return __virtualname__ return __virtualname__
elif __grains__['os'] in ('Debian', 'Raspbian'): elif __grains__['os'] in ('Debian', 'Raspbian'):
debian_initctl = '/sbin/initctl' debian_initctl = '/sbin/initctl'