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

guests/ubuntu: enable the new mount_nfs stuff

This commit is contained in:
Mitchell Hashimoto 2013-09-01 13:46:09 -07:00
parent 8bc01c7cb1
commit 7897de3fbd
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/guests/ubuntu/cap/mount_nfs.rb
View File

@ -1,4 +1,4 @@
require_relative '../../linux/cap/mount_nfs' require Vagrant.source_root.join("plugins/guests/linux/cap/mount_nfs")
module VagrantPlugins module VagrantPlugins
module GuestUbuntu module GuestUbuntu
@ -6,6 +6,7 @@ module VagrantPlugins
class MountNFS < GuestLinux::Cap::MountNFS class MountNFS < GuestLinux::Cap::MountNFS
def self.mount_nfs_folder(machine, ip, folders) def self.mount_nfs_folder(machine, ip, folders)
super super
# Emit an upstart events if upstart is available # Emit an upstart events if upstart is available
folders.each do |name, opts| folders.each do |name, opts|
real_guestpath = machine.guest.capability(:shell_expand_guest_path, opts[:guestpath]) real_guestpath = machine.guest.capability(:shell_expand_guest_path, opts[:guestpath])

2
plugins/guests/ubuntu/cap/mount_virtualbox_shared_folder.rb
View File

@ -1,4 +1,4 @@
require_relative '../../linux/cap/mount_virtualbox_shared_folder' require Vagrant.source_root.join("plugins/guests/linux/cap/mount_virtualbox_shared_folder")
module VagrantPlugins module VagrantPlugins
module GuestUbuntu module GuestUbuntu

11
plugins/guests/ubuntu/plugin.rb
View File

@ -16,16 +16,15 @@ module VagrantPlugins
Cap::ChangeHostName Cap::ChangeHostName
end end
guest_capability("ubuntu", "mount_nfs_folder") do
require_relative "cap/mount_nfs"
Cap::MountNFS
end
guest_capability("ubuntu", "mount_virtualbox_shared_folder") do guest_capability("ubuntu", "mount_virtualbox_shared_folder") do
require_relative "cap/mount_virtualbox_shared_folder" require_relative "cap/mount_virtualbox_shared_folder"
Cap::MountVirtualBoxSharedFolder Cap::MountVirtualBoxSharedFolder
end end
#I don't know if this works or not
#guest_capability("linux", "mount_nfs_folder") do
# require_relative "cap/mount_nfs"
# Cap::MountNFS
#end
end end
end end
end end