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

chroot connection plugin: defer get_option() call (#59065)

Browse source 
* The chroot connection plugin crashes because its constructor calls
  self.get_option(...) before the plugin loader has established its
  self._load_name.  Therefore, we should defer the self.get_option(...)
  call so that it happens in connect().

Fixes #59063
This commit is contained in:
Dara Poon 2019-07-16 08:31:07 -07:00 committed by Sloane Hertel
parent 88c4cf28ea
commit b16c264dca
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/plugins/connection/chroot.py
View file

@ -96,6 +96,8 @@ class Connection(ConnectionBase):
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)
def _connect(self):
''' connect to the chroot '''
if os.path.isabs(self.get_option('chroot_exe')):
self.chroot_cmd = self.get_option('chroot_exe')
else:
@ -104,8 +106,6 @@ class Connection(ConnectionBase):
if not self.chroot_cmd:
raise AnsibleError("chroot command (%s) not found in PATH" % to_native(self.get_option('chroot_exe')))
def _connect(self):
''' connect to the chroot; nothing to do here '''
super(Connection, self)._connect()
if not self._connected:
display.vvv("THIS IS A LOCAL CHROOT DIR", host=self.chroot)