diff --git a/changelogs/fragments/fix_doas.yml b/changelogs/fragments/fix_doas.yml new file mode 100644 index 00000000000..8f179d05b5b --- /dev/null +++ b/changelogs/fragments/fix_doas.yml @@ -0,0 +1,2 @@ +- bugfix: + - fix doas construction for become https://github.com/ansible/ansible/pull/37511 diff --git a/lib/ansible/playbook/play_context.py b/lib/ansible/playbook/play_context.py index 669584b0512..ea8bb8770df 100644 --- a/lib/ansible/playbook/play_context.py +++ b/lib/ansible/playbook/play_context.py @@ -544,7 +544,7 @@ class PlayContext(Base): flags += ' -u %s ' % self.become_user # FIXME: make shell independent - becomecmd = '%s %s echo %s && %s %s env ANSIBLE=true %s' % (exe, flags, success_key, exe, flags, cmd) + becomecmd = '%s %s %s -c %s' % (exe, flags, executable, success_cmd) elif self.become_method == 'dzdo': diff --git a/test/units/playbook/test_play_context.py b/test/units/playbook/test_play_context.py index 47b69582317..bcad2f6b306 100644 --- a/test/units/playbook/test_play_context.py +++ b/test/units/playbook/test_play_context.py @@ -153,8 +153,7 @@ def test_play_context_make_become_cmd(parser): play_context.become_method = 'doas' cmd = play_context.make_become_cmd(cmd=default_cmd, executable="/bin/bash") - assert (cmd == """%s %s echo %s && %s %s env ANSIBLE=true %s""" % (doas_exe, doas_flags, play_context. - success_key, doas_exe, doas_flags, default_cmd)) + assert (cmd == """%s %s %s -c 'echo %s; %s'""" % (doas_exe, doas_flags, default_exe, play_context.success_key, default_cmd)) play_context.become_method = 'ksu' cmd = play_context.make_become_cmd(cmd=default_cmd, executable="/bin/bash")