Proper support for NFS in FreeBSD

This commit is contained in:
John Watson 2011-09-26 10:39:58 -07:00 committed by Mitchell Hashimoto
parent 82c679b9a5
commit 8a0a1bddb5
4 changed files with 54 additions and 1 deletions

View File

@ -3,6 +3,7 @@ module Vagrant
autoload :Base, 'vagrant/hosts/base'
autoload :Arch, 'vagrant/hosts/arch'
autoload :BSD, 'vagrant/hosts/bsd'
autoload :FreeBSD,'vagrant/hosts/freebsd'
autoload :Fedora, 'vagrant/hosts/fedora'
autoload :Linux, 'vagrant/hosts/linux'
end

View File

@ -8,6 +8,7 @@ module Vagrant
include Util::Retryable
def self.distro_dispatch
return FreeBSD if Util::Platform.freebsd?
return self if Util::Platform.darwin? || Util::Platform.bsd?
end

View File

@ -0,0 +1,51 @@
require 'vagrant/util/platform'
module Vagrant
module Hosts
# Represents a FreeBSD host
class FreeBSD < BSD
include Util
include Util::Retryable
def nfs_export(ip, folders)
output = TemplateRenderer.render('nfs/exports',
:uuid => env.vm.uuid,
:ip => ip,
:folders => folders)
# The sleep ensures that the output is truly flushed before any `sudo`
# commands are issued.
env.ui.info I18n.t("vagrant.hosts.bsd.nfs_export.prepare")
sleep 0.5
output.split("\n").each do |line|
# This should only ask for administrative permission once, even
# though its executed in multiple subshells.
line = line.gsub('"', '\"')
system(%Q[sudo su root -c "echo '#{line}' >> /etc/exports"])
end
# We run restart here instead of "update" just in case nfsd
# is not starting
system("sudo /etc/rc.d/mountd onereload")
end
end
def nfs_cleanup
return if !File.exist?("/etc/exports")
retryable(:tries => 10, :on => TypeError) do
system("cat /etc/exports | grep 'VAGRANT-BEGIN: #{env.vm.uuid}' > /dev/null 2>&1")
if $?.to_i == 0
# Use sed to just strip out the block of code which was inserted
# by Vagrant
system("sudo sed -e '/^# VAGRANT-BEGIN: #{env.vm.uuid}/,/^# VAGRANT-END: #{env.vm.uuid}/ d' -ibak /etc/exports")
end
system("sudo /etc/rc.d/mountd onereload")
end
end
end
end

View File

@ -13,7 +13,7 @@ module Vagrant
platform.include?("darwin9")
end
[:darwin, :bsd, :linux].each do |type|
[:darwin, :bsd, :freebsd, :linux].each do |type|
define_method("#{type}?") do
platform.include?(type.to_s)
end