Merge pull request #6339 from threatgrid/systemd-template-svc-fix

systemd template services must not discard template part
reviewable/pr18780/r1
Michael DeHaan 11 years ago
commit cac81b1ad9

@ -412,11 +412,13 @@ class LinuxService(Service):
# adjust the service name to account for template service unit files # adjust the service name to account for template service unit files
index = name.find('@') index = name.find('@')
if index != -1: if index != -1:
name = name[:index+1] template_name = name[:index+1]
else:
template_name = name
self.__systemd_unit = None self.__systemd_unit = None
for line in out.splitlines(): for line in out.splitlines():
if line.startswith(name): if line.startswith(template_name):
self.__systemd_unit = name self.__systemd_unit = name
return True return True
return False return False

Loading…
Cancel
Save