ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

attempt to fix systemd in chroot env

Browse source 
fixes #21026
This commit is contained in:
Brian Coca 2017-02-06 13:05:29 -05:00 committed by Brian Coca
parent cd6792a058
commit 2f0070639f
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/ansible/modules/system/systemd.py
View file

@ -297,6 +297,7 @@ def main():
# check service data, cannot error out on rc as it changes across versions, assume not found # check service data, cannot error out on rc as it changes across versions, assume not found
(rc, out, err) = module.run_command("%s show '%s'" % (systemctl, unit)) (rc, out, err) = module.run_command("%s show '%s'" % (systemctl, unit))
if rc == 0: if rc == 0:
# load return of systemctl show into dictionary for easy access and return # load return of systemctl show into dictionary for easy access and return
multival = [] multival = []
@ -327,6 +328,18 @@ def main():
if is_systemd and 'LoadError' in result['status']: if is_systemd and 'LoadError' in result['status']:
module.fail_json(msg="Error loading unit file '%s': %s" % (unit, result['status']['LoadError'])) module.fail_json(msg="Error loading unit file '%s': %s" % (unit, result['status']['LoadError']))
elif out.find('ignoring request') != -1:
# fallback list-unit-files as show does not work on some systems (chroot)
# not used as primary as it skips some services (like those using init.d) and requires .service notation
if unit.endswith('.service'):
service = unit
else:
service = '%s.service' % unit
(rc, out, err) = module.run_command("%s list-unit-files '%s'" % (systemctl, service))
if rc == 0:
is_systemd = True
# Does service exist? # Does service exist?
found = is_systemd or is_initd found = is_systemd or is_initd
if is_initd and not is_systemd: if is_initd and not is_systemd: