diff options
| author | Tim Smith <tsmith@chef.io> | 2019-05-10 17:50:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-10 17:50:12 -0700 |
| commit | 7df11900e079f82e73f7469bf22013f0fc49e213 (patch) | |
| tree | 9b9f83d61277891bfc096046d91bb4a7298af3a5 /lib | |
| parent | d4188cfb5e6ca74a5ef3bda4d7c89ff249282360 (diff) | |
| parent | f52f71d4c98ea876fc50ebbe023de22871937069 (diff) | |
| download | chef-7df11900e079f82e73f7469bf22013f0fc49e213.tar.gz | |
Merge pull request #8507 from MarkGibbons/solaris_bootstrap
Use exports compatibile with /bin/sh in the bootstrap script
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/chef/knife/bootstrap/templates/chef-full.erb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/chef/knife/bootstrap/templates/chef-full.erb b/lib/chef/knife/bootstrap/templates/chef-full.erb index 54fa3a61d1..9f2e96ba84 100644 --- a/lib/chef/knife/bootstrap/templates/chef-full.erb +++ b/lib/chef/knife/bootstrap/templates/chef-full.erb @@ -1,5 +1,6 @@ sh -c ' -<%= "export https_proxy=\"#{knife_config[:bootstrap_proxy]}\"" if knife_config[:bootstrap_proxy] -%> +<%= "https_proxy=\"#{knife_config[:bootstrap_proxy]}\" export https_proxy" if knife_config[:bootstrap_proxy] %> +<%= "no_proxy=\"#{knife_config[:bootstrap_no_proxy]}\" export no_proxy" if knife_config[:bootstrap_no_proxy] %> if test "x$TMPDIR" = "x"; then tmp="/tmp" |