Fix bug in service where upstart services incorrectly use init scripts

Fixes #1170
This commit is contained in:
James Cammarata 2015-05-04 13:59:15 -05:00
parent f444e49dfa
commit c4f6e63117

View file

@ -853,7 +853,7 @@ class LinuxService(Service):
# systemd commands take the form <cmd> <action> <name> # systemd commands take the form <cmd> <action> <name>
svc_cmd = self.svc_cmd svc_cmd = self.svc_cmd
arguments = "%s %s" % (self.__systemd_unit, arguments) arguments = "%s %s" % (self.__systemd_unit, arguments)
elif self.svc_initscript: elif self.svc_cmd is None and self.svc_initscript:
# upstart # upstart
svc_cmd = "%s" % self.svc_initscript svc_cmd = "%s" % self.svc_initscript