Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

module/systemd: fix logic determining if a service needs to be enable… #46318

Merged
merged 2 commits into from
Oct 10, 2018
Merged

module/systemd: fix logic determining if a service needs to be enable… #46318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b877d9
module/systemd: fix logic determining if a service needs to be enable…
vladimir-mencl-eresearch Sep 28, 2018
5226ce2
backport/2.7/46245: add changelog fragment
vladimir-mencl-eresearch Oct 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions changelogs/fragments/46245-systemd-fix-service-enable-logic.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
bugfixes:
- In systemd module, allow scope to default to 'system'
- In systemd module, fix check if a systemd+initd service is enabled - disabled in systemd means disabled
5 changes: 3 additions & 2 deletions lib/ansible/modules/system/systemd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,10 +429,11 @@ def main():
enabled = True
elif rc == 1:
# if not a user or global user service and both init script and unit file exist stdout should have enabled/disabled, otherwise use rc entries
if module.params['scope'] == 'system' and \
if module.params['scope'] in (None, 'system') and \
not module.params['user'] and \
is_initd and \
(not out.strip().endswith('disabled') or sysv_is_enabled(unit)):
not out.strip().endswith('disabled') and \
sysv_is_enabled(unit):
enabled = True

# default to current state
Expand Down