Merge branch 'master' of github.com:tarrant/vagrant

CHANGELOG.md

@@ -83,6 +83,7 @@ BUG FIXES:
   - provisioners/shell: Retry getting SSH info a few times. [GH-3924]
   - provisioners/shell: PowerShell scripts can have args. [GH-4548]
   - synced\_folders/nfs: Don't modify NFS exports file if no exports. [GH-4619]
+  - synced\_folders/nfs: Prune exports for file path IDs. [GH-3815]
 
 PLUGIN AUTHOR CHANGES:
 

plugins/hosts/bsd/cap/nfs.rb

@@ -137,7 +137,7 @@ module VagrantPlugins
           user = Process.uid
 
           File.read("/etc/exports").lines.each do |line|
-            if id = line[/^# VAGRANT-BEGIN:( #{user})? ([A-Za-z0-9-]+?)$/, 2]
+            if id = line[/^# VAGRANT-BEGIN:( #{user})? ([\.\/A-Za-z0-9-_]+?)$/, 2]
               if valid_ids.include?(id)
                 logger.debug("Valid ID: #{id}")
               else

plugins/hosts/linux/cap/nfs.rb

@@ -71,7 +71,7 @@ module VagrantPlugins
           user = Process.uid
 
           File.read("/etc/exports").lines.each do |line|
-            if id = line[/^# VAGRANT-BEGIN:( #{user})? ([A-Za-z0-9-]+?)$/, 2]
+            if id = line[/^# VAGRANT-BEGIN:( #{user})? ([\.\/A-Za-z0-9-_]+?)$/, 2]
               if valid_ids.include?(id)
                 logger.debug("Valid ID: #{id}")
               else

website/docs/source/layouts/layout.erb

@@ -253,6 +253,7 @@
 									<li<%= sidebar_current("vmware-boxes") %>><a href="/v2/vmware/boxes.html">Boxes</a></li>
 									<li<%= sidebar_current("vmware-configuration") %>><a href="/v2/vmware/configuration.html">Configuration</a></li>
 									<li<%= sidebar_current("vmware-known-issues") %>><a href="/v2/vmware/known-issues.html">Known Issues</a></li>
+									<li<%= sidebar_current("vmware-kernel-upgrade") %>><a href="/v2/vmware/kernel-upgrade.html">Kernel Upgrade</a></li>
 								</ul>
 								<% end %>
 								<% end %>

website/docs/source/v2/vmware/kernel-upgrade.html.md

@@ -0,0 +1,55 @@
+---
+page_title: "Kernel Upgrade - VMware Provider"
+sidebar_current: "vmware-kernel-upgrade"
+---
+
+# Kernel Upgrade
+
+If as part of running your Vagrant environment with VMware, you perform
+a kernel upgrade, it is likely that the VMware guest tools will stop working.
+This breaks features of Vagrant such as synced folders and sometimes
+networking as well.
+
+This page documents how to upgrade your kernel and keep your guest tools
+functioning. If you're not planning to upgrade your kernel, then you can safely
+skip this page.
+
+## Enable Auto-Upgrade of VMware Tools
+
+If you're running a common OS, VMware tools can often auto-upgrade themselves.
+This setting is disabled by default. The Vagrantfile settings below will
+enable auto-upgrading:
+
+```ruby
+# Ensure that VMWare Tools recompiles kernel modules
+# when we update the linux images
+$fix_vmware_tools_script = <<SCRIPT
+sed -i.bak 's/answer AUTO_KMODS_ENABLED_ANSWER no/answer AUTO_KMODS_ENABLED_ANSWER yes/g' /etc/vmware-tools/locations
+sed -i.bak 's/answer AUTO_KMODS_ENABLED no/answer AUTO_KMODS_ENABLED yes/g' /etc/vmware-tools/locations
+SCRIPT
+
+Vagrant.configure(2) do |config|
+  # ...
+
+  config.vm.provision "shell", inline: $fix_vmware_tools_script
+end
+```
+
+Note that this doesn't work for every OS, so `vagrant up` with the above
+settings, do a kernel upgrade, and do a `vagrant reload`. If HGFS (synced
+folders) and everything appears to be working, great! If not, then read on...
+
+## Manually Reinstalling VMware Tools
+
+At this point, you'll have to manually reinstall VMware tools. The best
+source of information for how to do this is the
+[VMware documentation](http://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=1018414).
+
+There are some gotchas:
+
+  * Make sure you have the kernel headers properly installed. This varies
+    by distro but is generally a package available via the package manager.
+
+  * Watch the installation output carefully. Even if HGFS (synced folders)
+    support failed to build, the installer will output that installing VMware
+    tools was successful. Read the output to find any error messages.