Fixes #10016: Add `automount` flag if specified with synced_folder
This commit adds a new option to virtualbox synced_folders called `automount`, where if set to true, will supply the `--automount` flag to virtualbox.
This commit is contained in:
parent
5ac79d2821
commit
6d0dfb2690
|
@ -674,6 +674,8 @@ module VagrantPlugins
|
|||
hostpath]
|
||||
args << "--transient" if folder.key?(:transient) && folder[:transient]
|
||||
|
||||
args << "--automount" if folder.key?(:automount) && folder[:automount]
|
||||
|
||||
if folder[:SharedFoldersEnableSymlinksCreate]
|
||||
# Enable symlinks on the shared folder
|
||||
execute("setextradata", @uuid, "VBoxInternal2/SharedFoldersEnableSymlinksCreate/#{folder[:name]}", "1", retryable: true)
|
||||
|
|
|
@ -124,8 +124,10 @@ module VagrantPlugins
|
|||
name: os_friendly_id(id),
|
||||
hostpath: hostpath.to_s,
|
||||
transient: transient,
|
||||
SharedFoldersEnableSymlinksCreate: enable_symlink_create
|
||||
}
|
||||
SharedFoldersEnableSymlinksCreate: enable_symlink_create,
|
||||
automount: data[:automount]
|
||||
}.delete_if { |_,v| v.nil?}
|
||||
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -15,6 +15,12 @@ describe VagrantPlugins::ProviderVirtualBox::Driver::Version_5_0 do
|
|||
:transient=>false,
|
||||
:SharedFoldersEnableSymlinksCreate=>true}]}
|
||||
|
||||
let(:folders_automount) { [{:name=>"folder",
|
||||
:hostpath=>"/Users/brian/vagrant-folder",
|
||||
:transient=>false,
|
||||
:automount=>true,
|
||||
:SharedFoldersEnableSymlinksCreate=>true}]}
|
||||
|
||||
let(:folders_disabled) { [{:name=>"folder",
|
||||
:hostpath=>"/Users/brian/vagrant-folder",
|
||||
:transient=>false,
|
||||
|
@ -32,6 +38,19 @@ describe VagrantPlugins::ProviderVirtualBox::Driver::Version_5_0 do
|
|||
|
||||
end
|
||||
|
||||
it "enables automount if option is true" do
|
||||
expect(subprocess).to receive(:execute).
|
||||
with("VBoxManage", "setextradata", anything, "VBoxInternal2/SharedFoldersEnableSymlinksCreate/folder", "1", {:notify=>[:stdout, :stderr]}).
|
||||
and_return(subprocess_result(exit_code: 0))
|
||||
|
||||
expect(subprocess).to receive(:execute).
|
||||
with("VBoxManage", "sharedfolder", "add", anything, "--name", "folder", "--hostpath", "/Users/brian/vagrant-folder", "--automount", {:notify=>[:stdout, :stderr]}).
|
||||
and_return(subprocess_result(exit_code: 0))
|
||||
subject.share_folders(folders_automount)
|
||||
|
||||
end
|
||||
|
||||
|
||||
it "disables SharedFoldersEnableSymlinksCreate if false" do
|
||||
expect(subprocess).to receive(:execute).
|
||||
with("VBoxManage", "sharedfolder", "add", anything, "--name", "folder", "--hostpath", "/Users/brian/vagrant-folder", {:notify=>[:stdout, :stderr]}).
|
||||
|
|
|
@ -53,6 +53,15 @@ describe VagrantPlugins::ProviderVirtualBox::SyncedFolder do
|
|||
:disabled=>false,
|
||||
:__vagrantfile=>true}} }
|
||||
|
||||
|
||||
let(:folders_automount) { {"/folder"=>
|
||||
{:SharedFoldersEnableSymlinksCreate=>true,
|
||||
:guestpath=>"/folder",
|
||||
:hostpath=>"/Users/brian/vagrant-folder",
|
||||
:disabled=>false,
|
||||
:automount=>true,
|
||||
:__vagrantfile=>true}} }
|
||||
|
||||
let(:folders_nosymvar) { {"/folder"=>
|
||||
{:guestpath=>"/folder",
|
||||
:hostpath=>"/Users/brian/vagrant-folder",
|
||||
|
@ -88,6 +97,11 @@ describe VagrantPlugins::ProviderVirtualBox::SyncedFolder do
|
|||
expect(driver).to receive(:share_folders).with([{:name=>"folder", :hostpath=>"/Users/brian/vagrant-folder", :transient=>false, :SharedFoldersEnableSymlinksCreate=>true}])
|
||||
subject.prepare(machine, folders, nil)
|
||||
end
|
||||
|
||||
it "should prepare and share the folders with automount enabled" do
|
||||
expect(driver).to receive(:share_folders).with([{:name=>"folder", :hostpath=>"/Users/brian/vagrant-folder", :transient=>false, :SharedFoldersEnableSymlinksCreate=>true, :automount=>true}])
|
||||
subject.prepare(machine, folders_automount, nil)
|
||||
end
|
||||
end
|
||||
|
||||
describe "#os_friendly_id" do
|
||||
|
|
|
@ -18,6 +18,10 @@ the guest to the host and vice versa.
|
|||
|
||||
## Options
|
||||
|
||||
* `automount` (boolean) - If true, the `--automount` flag will be used when
|
||||
using the VirtualBox tools to share the folder with the guest vm. Defaults to false
|
||||
if not present.
|
||||
|
||||
* `SharedFoldersEnableSymlinksCreate` (boolean) - If false, will disable the
|
||||
ability to create symlinks with the given virtualbox shared folder. Defaults to
|
||||
true if the option is not present.
|
||||
|
|
Loading…
Reference in New Issue