From 258cf6092401168af4c53305c15d5dbd5607bc23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Sat, 11 May 2013 13:22:07 +0300 Subject: [PATCH] LinuxService: avoid enforcing systemd even if init.d script was found --- system/service | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/service b/system/service index 28e98d1ef06..02f40938a8b 100644 --- a/system/service +++ b/system/service @@ -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']