From 1ef679f683db7ecf2147f62ad81d1dff060e29bf Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Thu, 31 May 2012 23:42:28 +0200 Subject: [PATCH] SSH log level fatal. Thanks @petejkim This change makes it so that SSH errors are shown, whereas QUIET hid those as well. The main change to QUIET was to get rid of warnings, not errors, so this fixes that. --- CHANGELOG.md | 1 + lib/vagrant/ssh.rb | 2 +- templates/commands/ssh_config/config.erb | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 27e72e0f1..d2f9bde78 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,7 @@ - The check for whether a port is open or not is more complete. [GH-948] - Files that are included with `vagrant package --include` now properly preserve file attributes on earlier versions of Ruby. [GH-951] + - SSH uses LogLevel FATAL so that errors are still shown. ## 1.0.3 (May 1, 2012) diff --git a/lib/vagrant/ssh.rb b/lib/vagrant/ssh.rb index 85a044ae3..f23b4d0f3 100644 --- a/lib/vagrant/ssh.rb +++ b/lib/vagrant/ssh.rb @@ -76,7 +76,7 @@ module Vagrant # Command line options command_options = ["-p", options[:port].to_s, "-o", "UserKnownHostsFile=/dev/null", - "-o", "StrictHostKeyChecking=no", "-o", "LogLevel=QUIET"] + "-o", "StrictHostKeyChecking=no", "-o", "LogLevel=FATAL"] # Solaris/OpenSolaris/Illumos uses SunSSH which doesn't support the IdentitiesOnly option # (Also don't use it in plain mode, it'll skip user agents.) diff --git a/templates/commands/ssh_config/config.erb b/templates/commands/ssh_config/config.erb index 16cf0ed54..a2d8f2089 100644 --- a/templates/commands/ssh_config/config.erb +++ b/templates/commands/ssh_config/config.erb @@ -7,7 +7,7 @@ Host <%= host_key %> PasswordAuthentication no IdentityFile <%= private_key_path %> IdentitiesOnly yes - LogLevel QUIET + LogLevel FATAL <% if forward_agent -%> ForwardAgent yes <% end -%>