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

Update CHANGELOG

This commit is contained in:
Mitchell Hashimoto 2013-11-23 11:36:20 -08:00
parent dcf57bd2cc
commit 05e9dc6e59
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -22,6 +22,7 @@ BUG FIXES:
- guests/freebsd: Uses `sh` by default for shell. [GH-2485] - guests/freebsd: Uses `sh` by default for shell. [GH-2485]
- guests/ubuntu: "localhost" is preserved when changing hostnames. - guests/ubuntu: "localhost" is preserved when changing hostnames.
[GH-2383] [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] - hosts/gentoo: Support systemd for NFS startup. [GH-2382]
- providers/virtualbox: Don't start new VM if VirtualBox has transient - providers/virtualbox: Don't start new VM if VirtualBox has transient
failure during `up` from suspended. [GH-2479] failure during `up` from suspended. [GH-2479]

2
plugins/hosts/bsd/host.rb
View File

@ -83,6 +83,8 @@ module VagrantPlugins
hasmapall = false hasmapall = false
opts[:bsd__nfs_options].each do |opt| 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=/ if opt =~ /^mapall=/ || opt =~ /^maproot=/
hasmapall = true hasmapall = true
break break