wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #14859 from sivel/issue/14858

Browse source 
Strip proc_1 before testing it. Fixes #14858
This commit is contained in:
Brian Coca 2016-03-08 09:14:05 -05:00
commit eb4cb46c84
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/module_utils/facts.py
View file

@ -581,13 +581,16 @@ class Facts(object):
else: else:
proc_1 = os.path.basename(proc_1) proc_1 = os.path.basename(proc_1)
if proc_1 is not None:
proc_1 = proc_1.strip()
if proc_1 == 'init' or proc_1.endswith('sh'): if proc_1 == 'init' or proc_1.endswith('sh'):
# many systems return init, so this cannot be trusted, if it ends in 'sh' it probalby is a shell in a container # many systems return init, so this cannot be trusted, if it ends in 'sh' it probalby is a shell in a container
proc_1 = None proc_1 = None
# if not init/None it should be an identifiable or custom init, so we are done! # if not init/None it should be an identifiable or custom init, so we are done!
if proc_1 is not None: if proc_1 is not None:
self.facts['service_mgr'] = proc_1.strip() self.facts['service_mgr'] = proc_1
# start with the easy ones # start with the easy ones
elif self.facts['distribution'] == 'MacOSX': elif self.facts['distribution'] == 'MacOSX':