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

Be more lenient of symlinked /bin/sh inside the chroot #16239

Merged
merged 1 commit into from
Jun 14, 2016
Merged

Be more lenient of symlinked /bin/sh inside the chroot #16239

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion lib/ansible/plugins/connection/chroot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,11 @@ def __init__(self, play_context, new_stdin, *args, **kwargs):
raise AnsibleError("%s is not a directory" % self.chroot)

chrootsh = os.path.join(self.chroot, 'bin/sh')
if not is_executable(chrootsh):
# Want to check for a usable bourne shell inside the chroot.
# is_executable() == True is sufficient. For symlinks it
# gets really complicated really fast. So we punt on finding that
# out. As long as it's a symlink we assume that it will work
if not (is_executable(chrootsh) or (os.path.lexists(chrootsh) and os.path.islink(chrootsh))):
raise AnsibleError("%s does not look like a chrootable dir (/bin/sh missing)" % self.chroot)

self.chroot_cmd = distutils.spawn.find_executable('chroot')
Expand Down