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

Always clean the NFS exports

This commit is contained in:
Mitchell Hashimoto 2012-01-12 18:48:47 -08:00
parent 7dc5f8ca80
commit de450f7e63
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/vagrant/hosts/bsd.rb
View File

@ -56,14 +56,10 @@ module Vagrant
return if !File.exist?("/etc/exports") return if !File.exist?("/etc/exports")
retryable(:tries => 10, :on => TypeError) do retryable(:tries => 10, :on => TypeError) do
system("cat /etc/exports | grep 'VAGRANT-BEGIN: #{id}' > /dev/null 2>&1") # Use sed to just strip out the block of code which was inserted
# by Vagrant, and restart NFS.
if $?.to_i == 0 system("sudo sed -e '/^# VAGRANT-BEGIN: #{id}/,/^# VAGRANT-END: #{id}/ d' -ibak /etc/exports")
# Use sed to just strip out the block of code which was inserted system(@nfs_restart_command)
# by Vagrant, and restart NFS.
system("sudo sed -e '/^# VAGRANT-BEGIN: #{id}/,/^# VAGRANT-END: #{id}/ d' -ibak /etc/exports")
system(@nfs_restart_command)
end
end end
end end
end end

9
lib/vagrant/hosts/linux.rb
View File

@ -52,13 +52,10 @@ module Vagrant
def nfs_cleanup(id) def nfs_cleanup(id)
return if !File.exist?("/etc/exports") return if !File.exist?("/etc/exports")
system("cat /etc/exports | grep 'VAGRANT-BEGIN: #{id}' > /dev/null 2>&1")
if $?.to_i == 0 # Use sed to just strip out the block of code which was inserted
# Use sed to just strip out the block of code which was inserted # by Vagrant
# by Vagrant system("sudo sed -e '/^# VAGRANT-BEGIN: #{id}/,/^# VAGRANT-END: #{id}/ d' -ibak /etc/exports")
system("sudo sed -e '/^# VAGRANT-BEGIN: #{id}/,/^# VAGRANT-END: #{id}/ d' -ibak /etc/exports")
end
end end
end end
end end