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

Merge pull request #35244 from rallytime/bp-31677

Browse Source 
Back-port #31677 to 2016.3
This commit is contained in:
Mike Place 2016-08-06 16:53:27 +09:00 committed by GitHub
commit 2e9fa3799c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/modules/systemd.py
View File

@ -779,9 +779,11 @@ def enabled(name, **kwargs): # pylint: disable=unused-argument
# string will be non-empty.
if bool(__salt__['cmd.run'](cmd, python_shell=False)):
return True
else:
elif name in _get_sysv_services():
return _sysv_enabled(name)
return False
def disabled(name):
'''