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

kernel/v2: a host always exists, remove dumb check

This commit is contained in:
Mitchell Hashimoto 2014-01-07 21:20:28 -08:00
parent e9f6c81ab7
commit e2af545182
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -455,13 +455,9 @@ module VagrantPlugins
end end
if has_nfs if has_nfs
if !machine.env.host
errors << I18n.t("vagrant.config.vm.nfs_requires_host")
else
errors << I18n.t("vagrant.config.vm.nfs_not_supported") if \ errors << I18n.t("vagrant.config.vm.nfs_not_supported") if \
!machine.env.host.capability(:nfs_installed) !machine.env.host.capability(:nfs_installed)
end end
end
# Validate networks # Validate networks
has_fp_port_error = false has_fp_port_error = false

3
templates/locales/en.yml
View File

@ -877,9 +877,6 @@ en:
that `nfsd` is installed on your machine, and try again. If you're that `nfsd` is installed on your machine, and try again. If you're
on Windows, NFS isn't supported. If the problem persists, please on Windows, NFS isn't supported. If the problem persists, please
contact Vagrant support. contact Vagrant support.
nfs_requires_host: |-
Using NFS shared folders requires a host to be specified
using `config.vagrant.host`.
network_ip_ends_in_one: |- network_ip_ends_in_one: |-
Static IPs cannot end in ".1" since that address is always Static IPs cannot end in ".1" since that address is always
reserved for the router. Please use another ending. reserved for the router. Please use another ending.