Merge pull request #8828 from mkhon/nfsv4-default-tcp
nfs_udp is false by default if using NFS v4
This commit is contained in:
commit
a1529d5fbe
|
@ -127,9 +127,10 @@ module VagrantPlugins
|
||||||
def prepare_folder(machine, opts)
|
def prepare_folder(machine, opts)
|
||||||
opts[:map_uid] = prepare_permission(machine, :uid, opts)
|
opts[:map_uid] = prepare_permission(machine, :uid, opts)
|
||||||
opts[:map_gid] = prepare_permission(machine, :gid, opts)
|
opts[:map_gid] = prepare_permission(machine, :gid, opts)
|
||||||
opts[:nfs_udp] = true if !opts.key?(:nfs_udp)
|
|
||||||
opts[:nfs_version] ||= 3
|
opts[:nfs_version] ||= 3
|
||||||
|
if !opts.key?(:nfs_udp)
|
||||||
|
opts[:nfs_udp] = !opts[:nfs_version].to_s.start_with?('4')
|
||||||
|
end
|
||||||
|
|
||||||
if opts[:nfs_version].to_s.start_with?('4') && opts[:nfs_udp]
|
if opts[:nfs_version].to_s.start_with?('4') && opts[:nfs_udp]
|
||||||
machine.ui.info I18n.t("vagrant.actions.vm.nfs.v4_with_udp_warning")
|
machine.ui.info I18n.t("vagrant.actions.vm.nfs.v4_with_udp_warning")
|
||||||
|
|
Loading…
Reference in New Issue