diff options
| author | Salim Afiune <afiune@chef.io> | 2017-03-20 16:43:54 -0400 |
|---|---|---|
| committer | Salim Afiune <afiune@chef.io> | 2017-03-20 16:59:00 -0400 |
| commit | 99fb49e952593ccf9764e6aabb5817f597f1bdb2 (patch) | |
| tree | 3952dfb49a633480cf595adacd4f64c87db828db | |
| parent | b8bfb5631a1ad9ebc61a950648d67bf3723d640d (diff) | |
| download | chef-99fb49e952593ccf9764e6aabb5817f597f1bdb2.tar.gz | |
Modify chef-shell help messageafiune/COOL-336/tiny-fix
Signed-off-by: Salim Afiune <afiune@chef.io>
| -rw-r--r-- | lib/chef/shell.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/chef/shell.rb b/lib/chef/shell.rb index 85a8ab9cc4..b4c0277c57 100644 --- a/lib/chef/shell.rb +++ b/lib/chef/shell.rb @@ -211,8 +211,10 @@ module Shell When no CONFIG is specified, chef-shell attempts to load a default configuration file: * If a NAMED_CONF is given, chef-shell will load ~/.chef/NAMED_CONF/chef_shell.rb * If no NAMED_CONF is given chef-shell will load ~/.chef/chef_shell.rb if it exists -* chef-shell falls back to loading /etc/chef/client.rb or /etc/chef/solo.rb if -z or - -s options are given and no chef_shell.rb can be found. +* If no chef_shell.rb can be found, chef-shell falls back to load: + /etc/chef/client.rb if -z option is given. + /etc/chef/solo.rb if --solo-legacy-mode option is given. + .chef/knife.rb if -s option is given. FOOTER option :config_file, |