Fixes #10609: Properly set BSD options for /etc/exports

Prior to this commit, the BSD options for the /etc/exports file was not
properly set up in the correct order for a given entry. It was however
fixed for FreeBSD, but never for the original exports template. This
commit fixes that by unifying the BSD and FreeBSD templates.
This commit is contained in:
Brian Cain 2019-06-13 11:44:12 -07:00
parent 206ff9d4ca
commit fc4e03d559
No known key found for this signature in database
GPG Key ID: 9FC4639B2E4510A0
4 changed files with 2 additions and 7 deletions

View File

@ -120,7 +120,7 @@ module VagrantPlugins
end end
def self.nfs_exports_template(environment) def self.nfs_exports_template(environment)
"nfs/exports" "nfs/exports_bsd"
end end
def self.nfs_installed(environment) def self.nfs_installed(environment)

View File

@ -19,7 +19,7 @@ module VagrantPlugins
end end
def self.nfs_exports_template(environment) def self.nfs_exports_template(environment)
"nfs/exports_freebsd" "nfs/exports_bsd"
end end
def self.nfs_restart_command(environment) def self.nfs_restart_command(environment)

View File

@ -1,5 +0,0 @@
# VAGRANT-BEGIN: <%= user %> <%= uuid %>
<% folders.each do |dirs, opts| %>
<%= dirs.map { |d| "\"#{d}\"" }.join(" ") %> <%= ips.join(" ") %> <%=opts[:bsd__compiled_nfs_options] %>
<% end %>
# VAGRANT-END: <%= user %> <%= uuid %>