From e2af545182e3938ac3812e902017bef1ee024a27 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Tue, 7 Jan 2014 21:20:28 -0800 Subject: [PATCH] kernel/v2: a host always exists, remove dumb check --- plugins/kernel_v2/config/vm.rb | 8 ++------ templates/locales/en.yml | 3 --- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/plugins/kernel_v2/config/vm.rb b/plugins/kernel_v2/config/vm.rb index 7f62b7ed2..112785434 100644 --- a/plugins/kernel_v2/config/vm.rb +++ b/plugins/kernel_v2/config/vm.rb @@ -455,12 +455,8 @@ module VagrantPlugins end 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 \ - !machine.env.host.capability(:nfs_installed) - end + errors << I18n.t("vagrant.config.vm.nfs_not_supported") if \ + !machine.env.host.capability(:nfs_installed) end # Validate networks diff --git a/templates/locales/en.yml b/templates/locales/en.yml index eb4c6a7ed..a30bdd3b0 100644 --- a/templates/locales/en.yml +++ b/templates/locales/en.yml @@ -877,9 +877,6 @@ en: 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. - nfs_requires_host: |- - Using NFS shared folders requires a host to be specified - using `config.vagrant.host`. network_ip_ends_in_one: |- Static IPs cannot end in ".1" since that address is always reserved for the router. Please use another ending.