haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove check for nfs in config

This commit is contained in:
Brian Pitts 2014-05-03 16:10:01 -05:00
parent 4d90fdfec5
commit 9f62216f87
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/kernel_v2/config/vm.rb
View File

@ -513,7 +513,6 @@ module VagrantPlugins
end end
end end
has_nfs = false
used_guest_paths = Set.new used_guest_paths = Set.new
@__synced_folders.each do |id, options| @__synced_folders.each do |id, options|
# If the shared folder is disabled then don't worry about validating it # If the shared folder is disabled then don't worry about validating it
@ -540,8 +539,6 @@ module VagrantPlugins
end end
if options[:type] == :nfs if options[:type] == :nfs
has_nfs = true
if options[:owner] || options[:group] if options[:owner] || options[:group]
# Owner/group don't work with NFS # Owner/group don't work with NFS
errors << I18n.t("vagrant.config.vm.shared_folder_nfs_owner_group", errors << I18n.t("vagrant.config.vm.shared_folder_nfs_owner_group",
@ -559,11 +556,6 @@ module VagrantPlugins
end end
end end
if has_nfs
errors << I18n.t("vagrant.config.vm.nfs_not_supported") if \
!machine.env.host.capability(:nfs_installed)
end
# Validate networks # Validate networks
has_fp_port_error = false has_fp_port_error = false
fp_used = Set.new fp_used = Set.new

6
templates/locales/en.yml
View File

@ -1224,12 +1224,6 @@ en:
hostname_invalid_characters: |- hostname_invalid_characters: |-
The hostname set for the VM should only contain letters, numbers, The hostname set for the VM should only contain letters, numbers,
hyphens or dots. It cannot start with a hyphen or dot. 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: |- network_ip_ends_in_one: |-
You assigned a static IP ending in ".1" to this machine. You assigned a static IP ending in ".1" to this machine.
This is very often used by the router and can cause the This is very often used by the router and can cause the