From 9f62216f87a437c0f57a9ac47ef275c3aba5a0c4 Mon Sep 17 00:00:00 2001 From: Brian Pitts Date: Sat, 3 May 2014 16:10:01 -0500 Subject: [PATCH] Remove check for nfs in config --- plugins/kernel_v2/config/vm.rb | 8 -------- templates/locales/en.yml | 6 ------ 2 files changed, 14 deletions(-) diff --git a/plugins/kernel_v2/config/vm.rb b/plugins/kernel_v2/config/vm.rb index 9eaf6f1a8..b498a7a4b 100644 --- a/plugins/kernel_v2/config/vm.rb +++ b/plugins/kernel_v2/config/vm.rb @@ -513,7 +513,6 @@ module VagrantPlugins end end - has_nfs = false used_guest_paths = Set.new @__synced_folders.each do |id, options| # If the shared folder is disabled then don't worry about validating it @@ -540,8 +539,6 @@ module VagrantPlugins end if options[:type] == :nfs - has_nfs = true - if options[:owner] || options[:group] # Owner/group don't work with NFS errors << I18n.t("vagrant.config.vm.shared_folder_nfs_owner_group", @@ -559,11 +556,6 @@ module VagrantPlugins end end - if has_nfs - errors << I18n.t("vagrant.config.vm.nfs_not_supported") if \ - !machine.env.host.capability(:nfs_installed) - end - # Validate networks has_fp_port_error = false fp_used = Set.new diff --git a/templates/locales/en.yml b/templates/locales/en.yml index 979b58372..3eded4e70 100644 --- a/templates/locales/en.yml +++ b/templates/locales/en.yml @@ -1224,12 +1224,6 @@ en: hostname_invalid_characters: |- The hostname set for the VM should only contain letters, numbers, hyphens or dots. It cannot start with a hyphen or dot. - nfs_not_supported: |- - It appears your machine doesn't support NFS, or there is not an - adapter to enable NFS on this machine for Vagrant. Please verify - that `nfsd` is installed on your machine, and try again. If you're - on Windows, NFS isn't supported. If the problem persists, please - contact Vagrant support. network_ip_ends_in_one: |- You assigned a static IP ending in ".1" to this machine. This is very often used by the router and can cause the