diff --git a/lib/vagrant-sshfs/cap/guest/linux/sshfs_mount.rb b/lib/vagrant-sshfs/cap/guest/linux/sshfs_mount.rb index 2bd28ad..a2d0362 100644 --- a/lib/vagrant-sshfs/cap/guest/linux/sshfs_mount.rb +++ b/lib/vagrant-sshfs/cap/guest/linux/sshfs_mount.rb @@ -16,7 +16,7 @@ class MountSSHFS extend Vagrant::Util::Retryable @@logger = Log4r::Logger.new("vagrant::synced_folders::sshfs_mount") - def self.sshfs_is_folder_mounted(machine, opts) + def self.sshfs_forward_is_folder_mounted(machine, opts) mounted = false # expand the guest path so we can handle things like "~/vagrant" expanded_guest_path = machine.guest.capability( @@ -34,7 +34,7 @@ def self.sshfs_is_folder_mounted(machine, opts) return mounted end - def self.sshfs_mount_folder(machine, opts) + def self.sshfs_forward_mount_folder(machine, opts) # opts contains something like: # { :type=>:sshfs, # :guestpath=>"/sharedfolder", @@ -76,7 +76,7 @@ def self.sshfs_mount_folder(machine, opts) end end - def self.sshfs_unmount_folder(machine, opts) + def self.sshfs_forward_unmount_folder(machine, opts) # opts contains something like: # { :type=>:sshfs, # :guestpath=>"/sharedfolder", diff --git a/lib/vagrant-sshfs/plugin.rb b/lib/vagrant-sshfs/plugin.rb index 4f0e854..76eb8de 100644 --- a/lib/vagrant-sshfs/plugin.rb +++ b/lib/vagrant-sshfs/plugin.rb @@ -20,17 +20,17 @@ class Plugin < Vagrant.plugin("2") Command::SSHFS end - guest_capability("linux", "sshfs_mount_folder") do + guest_capability("linux", "sshfs_forward_mount_folder") do require_relative "cap/guest/linux/sshfs_mount" VagrantPlugins::GuestLinux::Cap::MountSSHFS end - guest_capability("linux", "sshfs_unmount_folder") do + guest_capability("linux", "sshfs_forward_unmount_folder") do require_relative "cap/guest/linux/sshfs_mount" VagrantPlugins::GuestLinux::Cap::MountSSHFS end - guest_capability("linux", "sshfs_is_folder_mounted") do + guest_capability("linux", "sshfs_forward_is_folder_mounted") do require_relative "cap/guest/linux/sshfs_mount" VagrantPlugins::GuestLinux::Cap::MountSSHFS end diff --git a/lib/vagrant-sshfs/synced_folder.rb b/lib/vagrant-sshfs/synced_folder.rb index aae2aa4..f0918f7 100644 --- a/lib/vagrant-sshfs/synced_folder.rb +++ b/lib/vagrant-sshfs/synced_folder.rb @@ -51,7 +51,7 @@ def enable(machine, folders, pluginopts) folders.each do |id, opts| # If already mounted then there is nothing to do - if machine.guest.capability(:sshfs_is_folder_mounted, opts) + if machine.guest.capability(:sshfs_forward_is_folder_mounted, opts) machine.ui.info( I18n.t("vagrant.sshfs.info.already_mounted", folder: opts[:guestpath])) @@ -75,7 +75,7 @@ def enable(machine, folders, pluginopts) end # Do the mount machine.ui.info(I18n.t("vagrant.sshfs.actions.mounting")) - machine.guest.capability(:sshfs_mount_folder, opts) + machine.guest.capability(:sshfs_forward_mount_folder, opts) end end @@ -95,7 +95,7 @@ def disable(machine, folders, opts) folders.each do |id, opts| # If not mounted then there is nothing to do - if ! machine.guest.capability(:sshfs_is_folder_mounted, opts) + if ! machine.guest.capability(:sshfs_forward_is_folder_mounted, opts) machine.ui.info( I18n.t("vagrant.sshfs.info.not_mounted", folder: opts[:guestpath])) @@ -104,7 +104,7 @@ def disable(machine, folders, opts) # Do the Unmount machine.ui.info(I18n.t("vagrant.sshfs.actions.unmounting")) - machine.guest.capability(:sshfs_unmount_folder, opts) + machine.guest.capability(:sshfs_forward_unmount_folder, opts) end end