From f9a42973d9681470c7498b6bd637a506bb620b14 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Sun, 29 Jan 2012 13:34:50 -0800 Subject: [PATCH] Select NFS version with :nfs_version --- lib/vagrant/action/vm/nfs.rb | 2 +- lib/vagrant/guest/linux.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/vagrant/action/vm/nfs.rb b/lib/vagrant/action/vm/nfs.rb index fb1abb78a..d888a836c 100644 --- a/lib/vagrant/action/vm/nfs.rb +++ b/lib/vagrant/action/vm/nfs.rb @@ -91,7 +91,7 @@ module Vagrant key, opts = data opts[:map_uid] = prepare_permission(:uid, opts) opts[:map_gid] = prepare_permission(:gid, opts) - opts[:version] ||= 3 + opts[:nfs_version] ||= 3 acc[key] = opts acc diff --git a/lib/vagrant/guest/linux.rb b/lib/vagrant/guest/linux.rb index 36096a09e..a0dd0b7c1 100644 --- a/lib/vagrant/guest/linux.rb +++ b/lib/vagrant/guest/linux.rb @@ -60,7 +60,7 @@ module Vagrant # Do the actual creating and mounting @vm.channel.sudo("mkdir -p #{real_guestpath}") - @vm.channel.sudo("mount -o vers=#{opts[:version]} #{ip}:'#{opts[:hostpath]}' #{real_guestpath}", + @vm.channel.sudo("mount -o vers=#{opts[:nfs_version]} #{ip}:'#{opts[:hostpath]}' #{real_guestpath}", :error_class => LinuxError, :error_key => :mount_nfs_fail) end