cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

corrected service detection in docker versions

Browse source 
now if 1 == bash it falls back into tool detection
This commit is contained in:
Brian Coca 2015-12-19 16:14:56 -05:00
parent e66c070e5c
commit bb2935549f
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -555,8 +555,8 @@ class Facts(object):
if proc_1 is None:
rc, proc_1, err = module.run_command("ps -p 1 -o comm|tail -n 1", use_unsafe_shell=True)
if proc_1 in ['init', '/sbin/init']:
# many systems return init, so this cannot be trusted
if proc_1 in ['init', '/sbin/init', 'bash']:
# many systems return init, so this cannot be trusted, bash is from docker
proc_1 = None
# if not init/None it should be an identifiable or custom init, so we are done!