Merge pull request #737 from oxyc/mount-options-fix

geerlingguy · web-flow · commit 5904e8e64af4 · 2016-06-16T11:29:21.000-05:00
Issue #734: Fix Vagrant 1.8.4 failing to mount NFS synced folders with empty mount_options
diff --git a/Vagrantfile b/Vagrantfile
@@ -107,7 +107,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       rsync__args: ['--verbose', '--archive', '--delete', '-z', '--chmod=ugo=rwX'],
       id: synced_folder['id'],
       create: synced_folder.include?('create') ? synced_folder['create'] : false,
-      mount_options: synced_folder.include?('mount_options') ? synced_folder['mount_options'] : []
+      mount_options: synced_folder.include?('mount_options') ? synced_folder['mount_options'] : nil
     }
     if synced_folder.include?('options_override')
       options = options.merge(synced_folder['options_override'])

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do \|config\|`
`107`	`107`	`rsync__args: ['--verbose', '--archive', '--delete', '-z', '--chmod=ugo=rwX'],`
`108`	`108`	`id: synced_folder['id'],`
`109`	`109`	`create: synced_folder.include?('create') ? synced_folder['create'] : false,`
`110`		`- mount_options: synced_folder.include?('mount_options') ? synced_folder['mount_options'] : []`
	`110`	`+ mount_options: synced_folder.include?('mount_options') ? synced_folder['mount_options'] : nil`
`111`	`111`	`}`
`112`	`112`	`if synced_folder.include?('options_override')`
`113`	`113`	`options = options.merge(synced_folder['options_override'])`