Update CHANGELOG

rtyler · Mar 15, 2012 · cd92d64 · cd92d64
1 parent 33187e1
commit cd92d64
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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