We're putting the keys directly in place; -c isn't used

This commit is contained in:
Joseph Hall 2016-01-07 12:59:18 -07:00
parent 5d7a0f6d81
commit e75b48f5ff

View file

@ -242,7 +242,7 @@ def _install(mpt):
or salt.syspaths.BOOTSTRAP)
# Exec the chroot command
cmd = 'if type salt-minion; then exit 0; '
cmd += 'else sh {0} -c /tmp; fi'.format(os.path.join(tmppath, 'bootstrap-salt.sh'))
cmd += 'else sh {0}; fi'.format(os.path.join(tmppath, 'bootstrap-salt.sh'))
return not __salt__['cmd.run_chroot'](mpt, cmd, python_shell=True)['retcode']