Merge branch 'rc.d-systemd' of git://github.com/glensc/ansible into sysd

reviewable/pr18780/r1
Michael DeHaan 12 years ago
commit da1738723a

@ -390,7 +390,6 @@ class LinuxService(Service):
break
# Locate a tool for runtime service management (start, stop etc.)
self.svc_cmd = ''
if location.get('service', None) and os.path.exists("/etc/init.d/%s" % self.name):
# SysV init script
self.svc_cmd = location['service']
@ -405,7 +404,7 @@ class LinuxService(Service):
self.svc_initscript = initscript
# couldn't find anything yet, assume systemd
if self.svc_initscript is None:
if self.svc_cmd is None and self.svc_initscript is None:
if location.get('systemctl'):
self.svc_cmd = location['systemctl']

Loading…
Cancel
Save