Merge pull request #6977 from erSitzt/fix/master/tinycore_nfs_mount

Fix/master/tinycore nfs mount
This commit is contained in:
Seth Vargo 2016-02-04 12:09:35 -05:00
commit ad28bcb448
2 changed files with 51 additions and 0 deletions

View File

@ -0,0 +1,46 @@
require "vagrant/util/retryable"
module VagrantPlugins
module GuestTinyCore
module Cap
class MountNFS
extend Vagrant::Util::Retryable
def self.mount_nfs_folder(machine, ip, folders)
folders.each do |name, opts|
# Expand the guest path so we can handle things like "~/vagrant"
expanded_guest_path = machine.guest.capability(
:shell_expand_guest_path, opts[:guestpath])
# Do the actual creating and mounting
machine.communicate.sudo("mkdir -p #{expanded_guest_path}")
# Mount
hostpath = opts[:hostpath].dup
hostpath.gsub!("'", "'\\\\''")
# Figure out any options
mount_opts = ["vers=#{opts[:nfs_version]}"]
mount_opts << "udp" if opts[:nfs_udp]
if opts[:mount_options]
mount_opts = opts[:mount_options].dup
end
mount_command = "mount.nfs -o '#{mount_opts.join(",")}' #{ip}:'#{hostpath}' #{expanded_guest_path}"
retryable(on: Vagrant::Errors::LinuxNFSMountFailed, tries: 8, sleep: 3) do
machine.communicate.sudo(mount_command,
error_class: Vagrant::Errors::LinuxNFSMountFailed)
end
# Emit an upstart event if we can
machine.communicate.sudo <<-SCRIPT
if command -v /sbin/init &>/dev/null && /sbin/init --version | grep upstart &>/dev/null; then
/sbin/initctl emit --no-wait vagrant-mounted MOUNTPOINT='#{expanded_guest_path}'
fi
SCRIPT
end
end
end
end
end
end

View File

@ -30,6 +30,11 @@ module VagrantPlugins
require_relative "cap/rsync"
Cap::RSync
end
guest_capability("tinycore", "mount_nfs_folder") do
require_relative "cap/mount_nfs"
Cap::MountNFS
end
end
end
end