summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlamont-granquist <lamont@scriptkiddie.org>2013-09-30 14:27:35 -0700
committerlamont-granquist <lamont@scriptkiddie.org>2013-09-30 14:27:35 -0700
commit37be5bcf623c60bbdbedcbeab246924f82c6adb7 (patch)
tree7857097dbc3c9e6946d9797ac98b6ea06bb7909f
parent008973c3c0b5598eed5f8d649c3eb8c6adf9325a (diff)
parentc3c92071cd8139d607bb59d86952ee640f6748df (diff)
downloadchef-37be5bcf623c60bbdbedcbeab246924f82c6adb7.tar.gz
Merge pull request #987 from opscode/lcg/CHEF-3982
CHEF-3982: Solaris bootstrap PATH << /opt/sfw/bin
-rw-r--r--lib/chef/knife/bootstrap/chef-full.erb8
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/chef/knife/bootstrap/chef-full.erb b/lib/chef/knife/bootstrap/chef-full.erb
index 974b522653..94d1ff8a05 100644
--- a/lib/chef/knife/bootstrap/chef-full.erb
+++ b/lib/chef/knife/bootstrap/chef-full.erb
@@ -1,6 +1,14 @@
bash -c '
<%= "export http_proxy=\"#{knife_config[:bootstrap_proxy]}\"" if knife_config[:bootstrap_proxy] -%>
+distro=`uname -s`
+
+if [ "X$distro" == "XSunOS" ]; then
+ if [ -e "/usr/sfw/bin" ]; then
+ export PATH=/usr/sfw/bin:$PATH
+ fi
+fi
+
exists() {
if command -v $1 &>/dev/null
then