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

LinuxService: avoid enforcing systemd even if init.d script was found

Browse source
This commit is contained in:
Elan Ruusamäe 2013-05-11 13:22:07 +03:00
parent 8ef18c2f98
commit 6949a9fbe4
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
library/system/service
View file

@ -390,7 +390,7 @@ class LinuxService(Service):
break
# Locate a tool for runtime service management (start, stop etc.)
self.svc_cmd = ''
self.svc_cmd = None
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 +405,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']