Merge pull request #25216 from jfindlay/bsd_srv

replace shell code with native python code
This commit is contained in:
Pedro Algarvio 2015-07-09 10:58:44 +01:00
commit 718c874fdd

View file

@ -233,13 +233,17 @@ def enable(name, **kwargs):
salt '*' service.enable <service name>
salt '*' service.enable <service name> flags=<flags>
'''
cmd = '{0} set {1} status on'.format(_cmd(), name)
stat_cmd = '{0} set {1} status on'.format(_cmd(), name)
stat_retcode = __salt__['cmd.retcode'](stat_cmd)
flag_retcode = None
# only (re)set flags for services that have an rc.d(8) script
if os.path.exists('/etc/rc.d/{0}'.format(name)):
flags = _get_flags(**kwargs)
cmd = cmd + ' && {0} set {1} flags {2}'.format(_cmd(), name, flags)
flag_cmd = '{0} set {1} flags {2}'.format(_cmd(), name, flags)
flag_retcode = __salt__['cmd.retcode'](flag_cmd)
return not __salt__['cmd.retcode'](cmd)
return not any([stat_retcode, flag_retcode])
def disable(name, **kwargs):