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

hosts/bsd: make directories unique when exporting

This commit is contained in:
Mitchell Hashimoto 2014-02-26 08:04:21 -08:00
parent 5f1caf3ada
commit d14f3e0a56
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -88,6 +88,8 @@ BUG FIXES:
[GH-2792] [GH-2792]
- hosts/bsd: Don't invoke shell for NFS sudo calls. [GH-2808] - hosts/bsd: Don't invoke shell for NFS sudo calls. [GH-2808]
- hosts/bsd: Sort NFS exports to avoid false validation errors. [GH-2927] - hosts/bsd: Sort NFS exports to avoid false validation errors. [GH-2927]
- hosts/bsd: No more checkexports NFS errors if you're sharing the
same directory. [GH-3023]
- hosts/gentoo: Look for systemctl in `/usr/bin` [GH-2858] - hosts/gentoo: Look for systemctl in `/usr/bin` [GH-2858]
- hosts/linux: Properly escape regular expression to prune NFS exports, - hosts/linux: Properly escape regular expression to prune NFS exports,
allowing VMware to work properly. [GH-2934] allowing VMware to work properly. [GH-2934]

4
plugins/hosts/bsd/cap/nfs.rb
View File

@ -50,8 +50,10 @@ module VagrantPlugins
end end
# Sort all the keys by length so that the directory closest to # Sort all the keys by length so that the directory closest to
# the root is exported first. # the root is exported first. Also, remove duplicates so that
# checkexports will work properly.
dirmap.each do |dirs, _| dirmap.each do |dirs, _|
dirs.uniq!
dirs.sort_by! { |d| d.length } dirs.sort_by! { |d| d.length }
end end