diff --git a/CHANGELOG.md b/CHANGELOG.md index bc5de9b58..5926e0c10 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ BUG FIXES: - guests/freebsd: Uses `sh` by default for shell. [GH-2485] - guests/ubuntu: "localhost" is preserved when changing hostnames. [GH-2383] + - hosts/bsd: Don't set mapall if maproot is set in NFS. [GH-2448] - hosts/gentoo: Support systemd for NFS startup. [GH-2382] - providers/virtualbox: Don't start new VM if VirtualBox has transient failure during `up` from suspended. [GH-2479] diff --git a/plugins/hosts/bsd/host.rb b/plugins/hosts/bsd/host.rb index 2fefd17fd..f0214e3c7 100644 --- a/plugins/hosts/bsd/host.rb +++ b/plugins/hosts/bsd/host.rb @@ -83,6 +83,8 @@ module VagrantPlugins hasmapall = false opts[:bsd__nfs_options].each do |opt| + # mapall/maproot are mutually exclusive, so we have to check + # for both here. if opt =~ /^mapall=/ || opt =~ /^maproot=/ hasmapall = true break