From 6949a9fbe4dbfafa5299dc20e188fa3c3814014e 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 1/2] LinuxService: avoid enforcing systemd even if init.d script was found --- library/system/service | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/system/service b/library/system/service index 28e98d1ef0..02f40938a8 100644 --- a/library/system/service +++ b/library/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'] From d3a2b1dbbb1f2bd89dbfec2c4c3cc2cba0853beb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Sun, 19 May 2013 00:20:10 +0300 Subject: [PATCH 2/2] no need to init None to None --- library/system/service | 1 - 1 file changed, 1 deletion(-) diff --git a/library/system/service b/library/system/service index 02f40938a8..124740b7c8 100644 --- a/library/system/service +++ b/library/system/service @@ -390,7 +390,6 @@ class LinuxService(Service): break # Locate a tool for runtime service management (start, stop etc.) - 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']