Skip to content

A
ansible
Commit 82ec224a by Eri Bastos Committed by James Cammarata
Options

Proposed fix for issue #7757

parent 500d8f1e
Showing with 3 additions and 3 deletions
library/system/service
...@@ -576,7 +576,7 @@ class LinuxService(Service): ...@@ -576,7 +576,7 @@ class LinuxService(Service):
override_file.close() override_file.close()
initpath = '/etc/init' initpath = '/etc/init'
manreg = re.compile('^manual\s*$', re.M | re.I) manreg = re.compile('^start on manual\s*$', re.M | re.I)
conf_file_name = "%s/%s.conf" % (initpath, self.name) conf_file_name = "%s/%s.conf" % (initpath, self.name)
override_file_name = "%s/%s.override" % (initpath, self.name) override_file_name = "%s/%s.override" % (initpath, self.name)
...@@ -591,12 +591,12 @@ class LinuxService(Service): ...@@ -591,12 +591,12 @@ class LinuxService(Service):
write_to_override_file(override_file_name, manreg.sub('', override_file_contents)) write_to_override_file(override_file_name, manreg.sub('', override_file_contents))
# Add manual stanza if not present and service disabled # Add manual stanza if not present and service disabled
elif not (self.enable) and not (manreg.search(override_file_contents)): elif not (self.enable) and not (manreg.search(override_file_contents)):
write_to_override_file(override_file_name, override_file_contents + '\nmanual\n') write_to_override_file(override_file_name, override_file_contents + '\nstart on manual\n')
else: else:
return return
# Add file with manual stanza if service disabled # Add file with manual stanza if service disabled
elif not (self.enable): elif not (self.enable):
write_to_override_file(override_file_name, 'manual\n') write_to_override_file(override_file_name, 'start on manual\n')
else: else:
return return
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment