diff options
| author | Rob Di Marco <rob@innovationontherun.com> | 2011-11-17 10:50:54 -0500 |
|---|---|---|
| committer | Bryan McLellan <btm@opscode.com> | 2012-03-08 09:04:09 -0800 |
| commit | 7914313b33e0a8815dfa229e6f748b7effcaefef (patch) | |
| tree | 5af5a40d700d451f688324e3625b070f53594c10 | |
| parent | 6fa7cb289a69c8b3e0b1e13bf45cc039efab51e9 (diff) | |
| download | chef-7914313b33e0a8815dfa229e6f748b7effcaefef.tar.gz | |
Allow for the path to the chef client called by knife bootstrap to be specified in options or in a different part of the path than /usr/bin
| -rw-r--r-- | chef/lib/chef/knife/core/bootstrap_context.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chef/lib/chef/knife/core/bootstrap_context.rb b/chef/lib/chef/knife/core/bootstrap_context.rb index 184b275b82..12829d9ccb 100644 --- a/chef/lib/chef/knife/core/bootstrap_context.rb +++ b/chef/lib/chef/knife/core/bootstrap_context.rb @@ -80,7 +80,8 @@ CONFIG end def start_chef - s = "/usr/bin/chef-client -j /etc/chef/first-boot.json" + client_path = @chef_config[:chef_client_path] || '/usr/bin/env chef-client' + s = "#{client_path} -j /etc/chef/first-boot.json" s << " -E #{bootstrap_environment}" if chef_version.to_f != 0.9 # only use the -E option on Chef 0.10+ s end |