cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Michael DeHaan 2013-05-31 15:20:48 -04:00
commit 0b30c74e86
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
library/system/service
View file

@ -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']