From cd92d6483fb02292384cb8a831c158b83e79ca6c Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Thu, 15 Mar 2012 09:52:28 -0600 Subject: [PATCH] Update CHANGELOG --- CHANGELOG.md | 2 ++ lib/vagrant/config/ssh.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d261e9a36c0..b4f06e44c47 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ used, so that `vagrant provision` works. [GH-803] - Nicer error message if an unsupported SSH key type is used. [GH-805] - Gentoo guests can now have their host names changed. [GH-796] + - Relative paths can be used for the `config.ssh.private_key_path` + setting. [GH-808] ## 1.0.1 (March 11, 2012) diff --git a/lib/vagrant/config/ssh.rb b/lib/vagrant/config/ssh.rb index 898f7bfe321..f8639e80f8c 100644 --- a/lib/vagrant/config/ssh.rb +++ b/lib/vagrant/config/ssh.rb @@ -18,7 +18,7 @@ def validate(env, errors) errors.add(I18n.t("vagrant.config.common.error_empty", :field => field)) if !instance_variable_get("@#{field}".to_sym) end - if private_key_path && !File.file?(File.expand_path(private_key_path)) + if private_key_path && !File.file?(File.expand_path(private_key_path, env.root_path)) errors.add(I18n.t("vagrant.config.ssh.private_key_missing", :path => private_key_path)) end end