From c4f6e63117cd378ed5b144bf6c8391420a2381ab Mon Sep 17 00:00:00 2001
From: James Cammarata <jimi@sngx.net>
Date: Mon, 4 May 2015 13:59:15 -0500
Subject: [PATCH] Fix bug in service where upstart services incorrectly use
init scripts
Fixes #1170
---
system/service.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/system/service.py b/system/service.py
index 0c433bb8cca..3589340f152 100644
--- a/system/service.py
+++ b/system/service.py
@@ -853,7 +853,7 @@ class LinuxService(Service):
# systemd commands take the form <cmd> <action> <name>
svc_cmd = self.svc_cmd
arguments = "%s %s" % (self.__systemd_unit, arguments)
- elif self.svc_initscript:
+ elif self.svc_cmd is None and self.svc_initscript:
# upstart
svc_cmd = "%s" % self.svc_initscript