Commit 6949a9fb by Elan Ruusamäe

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

parent 8ef18c2f
...@@ -390,7 +390,7 @@ class LinuxService(Service): ...@@ -390,7 +390,7 @@ class LinuxService(Service):
break break
# Locate a tool for runtime service management (start, stop etc.) # 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): if location.get('service', None) and os.path.exists("/etc/init.d/%s" % self.name):
# SysV init script # SysV init script
self.svc_cmd = location['service'] self.svc_cmd = location['service']
...@@ -405,7 +405,7 @@ class LinuxService(Service): ...@@ -405,7 +405,7 @@ class LinuxService(Service):
self.svc_initscript = initscript self.svc_initscript = initscript
# couldn't find anything yet, assume systemd # 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'): if location.get('systemctl'):
self.svc_cmd = location['systemctl'] self.svc_cmd = location['systemctl']
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment