Shared folders with no guest path are not automounted [closes GH-184]
This commit is contained in:
parent
4cbce66ab1
commit
c1be64ae61
|
@ -3,6 +3,7 @@
|
||||||
- Use numeric uid/gid in mounting shared folders to increase portability. [GH-252]
|
- Use numeric uid/gid in mounting shared folders to increase portability. [GH-252]
|
||||||
- HTTP downloading follows redirects. [GH-163]
|
- HTTP downloading follows redirects. [GH-163]
|
||||||
- Downloaders have clearer output to note what they're doing.
|
- Downloaders have clearer output to note what they're doing.
|
||||||
|
- Shared folders with no guest path are not automounted. [GH-184]
|
||||||
|
|
||||||
## 0.7.0.beta (December 24, 2010)
|
## 0.7.0.beta (December 24, 2010)
|
||||||
|
|
||||||
|
|
|
@ -50,10 +50,17 @@ module Vagrant
|
||||||
|
|
||||||
@env["vm"].ssh.execute do |ssh|
|
@env["vm"].ssh.execute do |ssh|
|
||||||
shared_folders.each do |name, data|
|
shared_folders.each do |name, data|
|
||||||
@env.ui.info(I18n.t("vagrant.actions.vm.share_folders.mounting_entry",
|
if data[:guestpath]
|
||||||
:name => name,
|
# Guest path specified, so mount the folder to specified point
|
||||||
:guest_path => data[:guestpath]))
|
@env.ui.info(I18n.t("vagrant.actions.vm.share_folders.mounting_entry",
|
||||||
@env["vm"].system.mount_shared_folder(ssh, name, data[:guestpath])
|
:name => name,
|
||||||
|
:guest_path => data[:guestpath]))
|
||||||
|
@env["vm"].system.mount_shared_folder(ssh, name, data[:guestpath])
|
||||||
|
else
|
||||||
|
# If no guest path is specified, then automounting is disabled
|
||||||
|
@env.ui.info(I18n.t("vagrant.actions.vm.share_folders.nomount_entry",
|
||||||
|
:name => name))
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -361,6 +361,7 @@ en:
|
||||||
creating: Creating shared folders metadata...
|
creating: Creating shared folders metadata...
|
||||||
mounting: Mounting shared folders...
|
mounting: Mounting shared folders...
|
||||||
mounting_entry: "-- %{name}: %{guest_path}"
|
mounting_entry: "-- %{name}: %{guest_path}"
|
||||||
|
nomount_entry: "-- %{name}: Automounting disabled."
|
||||||
suspend:
|
suspend:
|
||||||
suspending: Saving VM state and suspending execution...
|
suspending: Saving VM state and suspending execution...
|
||||||
|
|
||||||
|
|
|
@ -116,6 +116,7 @@ class ShareFoldersVMActionTest < Test::Unit::TestCase
|
||||||
@folders = stub_shared_folders(<<-sf)
|
@folders = stub_shared_folders(<<-sf)
|
||||||
config.vm.share_folder("foo", "fooguest", "foohost")
|
config.vm.share_folder("foo", "fooguest", "foohost")
|
||||||
config.vm.share_folder("bar", "barguest", "barhost")
|
config.vm.share_folder("bar", "barguest", "barhost")
|
||||||
|
config.vm.share_folder("foo_no_mount", nil, "foohost2")
|
||||||
sf
|
sf
|
||||||
@ssh = mock("ssh")
|
@ssh = mock("ssh")
|
||||||
@vm.ssh.stubs(:execute).yields(@ssh)
|
@vm.ssh.stubs(:execute).yields(@ssh)
|
||||||
|
@ -125,7 +126,11 @@ class ShareFoldersVMActionTest < Test::Unit::TestCase
|
||||||
should "mount all shared folders to the VM" do
|
should "mount all shared folders to the VM" do
|
||||||
mount_seq = sequence("mount_seq")
|
mount_seq = sequence("mount_seq")
|
||||||
@folders.each do |name, data|
|
@folders.each do |name, data|
|
||||||
@vm.system.expects(:mount_shared_folder).with(@ssh, name, data[:guestpath]).in_sequence(mount_seq)
|
if data[:guestpath]
|
||||||
|
@vm.system.expects(:mount_shared_folder).with(@ssh, name, data[:guestpath]).in_sequence(mount_seq)
|
||||||
|
else
|
||||||
|
@vm.system.expects(:mount_shared_folder).with(@ssh, name, anything).never
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@instance.mount_shared_folders
|
@instance.mount_shared_folders
|
||||||
|
|
Loading…
Reference in New Issue